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

在庫文字消していたのを再度追加、在庫枠一部調整

This commit is contained in:
koya_15 2022-05-20 15:26:38 +09:00
parent d8318e08af
commit 072a4fd20c
11 changed files with 318 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
popcorn/Assets/MyGame/Resource/Material/marketing/Customize/icon/ui_marketing_Customize_icon_stock_b.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_StockMeter_Second.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 18 KiB

5
popcorn/Assets/MyGame/Resources/ShopCustomize/Decoration2_a.prefab
View File

@ -67,6 +67,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4364022137937732700, guid: 2c2ecbebcc1bd4885a47517c698026fa,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.076
objectReference: {fileID: 0}
- target: {fileID: 5228767001950558546, guid: 2c2ecbebcc1bd4885a47517c698026fa,
type: 3}
propertyPath: m_Sprite

2
popcorn/Assets/MyGame/Resources/ShopCustomize/Decoration2_c.prefab
View File

@ -70,7 +70,7 @@ PrefabInstance:
- target: {fileID: 4364022137937732700, guid: 2c2ecbebcc1bd4885a47517c698026fa,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.035
value: 0.175
objectReference: {fileID: 0}
- target: {fileID: 4364022137937732700, guid: 2c2ecbebcc1bd4885a47517c698026fa,
type: 3}

5
popcorn/Assets/MyGame/Resources/ShopCustomize/Signboard_a.prefab
View File

@ -67,5 +67,10 @@ PrefabInstance:
propertyPath: m_Name
value: Signboard_a
objectReference: {fileID: 0}
- target: {fileID: 8332490658364066617, guid: 0db033495b6ff449ea623f57ea9250ef,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0db033495b6ff449ea623f57ea9250ef, type: 3}

5
popcorn/Assets/MyGame/Resources/ShopCustomize/Signboard_b.prefab
View File

@ -73,5 +73,10 @@ PrefabInstance:
value:
objectReference: {fileID: 21300000, guid: 82625d5bbfe39114e93ffb52dbe1af25,
type: 3}
- target: {fileID: 8332490658364066617, guid: 0db033495b6ff449ea623f57ea9250ef,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.05
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0db033495b6ff449ea623f57ea9250ef, type: 3}

5
popcorn/Assets/MyGame/Resources/ShopCustomize/Signboard_c.prefab
View File

@ -73,5 +73,10 @@ PrefabInstance:
value:
objectReference: {fileID: 21300000, guid: cee29e082ddcf9743ab95cb745d03b2f,
type: 3}
- target: {fileID: 8332490658364066617, guid: 0db033495b6ff449ea623f57ea9250ef,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.14
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0db033495b6ff449ea623f57ea9250ef, type: 3}

10
popcorn/Assets/MyGame/Resources/ShopCustomize/Stock_b.prefab
View File

@ -7,6 +7,16 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2640383126096438143, guid: 2893923eb88ee4eb69c2dda4df483a0b,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.05
objectReference: {fileID: 0}
- target: {fileID: 2640383126096438143, guid: 2893923eb88ee4eb69c2dda4df483a0b,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.14
objectReference: {fileID: 0}
- target: {fileID: 3373136197140018219, guid: 2893923eb88ee4eb69c2dda4df483a0b,
type: 3}
propertyPath: m_LocalPosition.x

5
popcorn/Assets/MyGame/Resources/ShopCustomize/Stock_c.prefab
View File

@ -7,6 +7,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2640383126096438143, guid: 2893923eb88ee4eb69c2dda4df483a0b,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.98
objectReference: {fileID: 0}
- target: {fileID: 2922805836281354774, guid: 2893923eb88ee4eb69c2dda4df483a0b,
type: 3}
propertyPath: m_Sprite

200
popcorn/Assets/MyGame/Scenes/Main/Main.unity
View File

@ -234,6 +234,18 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &40763333 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3664916832642567898, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 3664916832445709976}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &82006168
GameObject:
m_ObjectHideFlags: 0
@ -367,6 +379,19 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &222819342
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1818084248}
--- !u!114 &249665956 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7685984615756169863, guid: caaa748dbeed576499e8cae74d33f689,
@ -2447,6 +2472,19 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &587683164
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 2073229470}
--- !u!1 &590848656
GameObject:
m_ObjectHideFlags: 0
@ -2779,6 +2817,19 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &705206548
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1012256676}
--- !u!1 &720964441
GameObject:
m_ObjectHideFlags: 0
@ -3043,6 +3094,19 @@ Transform:
m_Father: {fileID: 2124297504}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &799452510
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1242840770}
--- !u!1 &811671644
GameObject:
m_ObjectHideFlags: 0
@ -3600,6 +3664,19 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &959950257
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1215422478}
--- !u!1 &1002868794
GameObject:
m_ObjectHideFlags: 0
@ -3681,6 +3758,18 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &1012256676 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1750965193008879782, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 3664916832445709976}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1036488657
GameObject:
m_ObjectHideFlags: 0
@ -4169,6 +4258,18 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &1163046103 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3664916832330421304, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 3664916832445709976}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1175036173
GameObject:
m_ObjectHideFlags: 0
@ -4231,6 +4332,30 @@ Transform:
m_Father: {fileID: 1124341217}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1215422478 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3664916834061038029, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 3664916832445709976}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1242840770 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3664916832434116137, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 3664916832445709976}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1263997929
GameObject:
m_ObjectHideFlags: 0
@ -4778,6 +4903,19 @@ Transform:
m_Father: {fileID: 2088316431}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1416243773
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1163046103}
--- !u!1 &1423285229
GameObject:
m_ObjectHideFlags: 0
@ -4891,6 +5029,18 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &1434932932 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 390120330251131619, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 3664916832445709976}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1436460245
GameObject:
m_ObjectHideFlags: 0
@ -5004,6 +5154,19 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &1452214813
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 1434932932}
--- !u!1 &1464051178
GameObject:
m_ObjectHideFlags: 0
@ -5085,6 +5248,19 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &1486963627
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3}
m_Name:
m_EditorClassIdentifier:
mTarget: {fileID: 40763333}
--- !u!1 &1592053832
GameObject:
m_ObjectHideFlags: 0
@ -5999,6 +6175,18 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1796729966}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1818084248 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3664916833050583564, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 3664916832445709976}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1821652564
GameObject:
m_ObjectHideFlags: 0
@ -7313,6 +7501,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2073229470 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1382553612690395228, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
m_PrefabInstance: {fileID: 3664916832445709976}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2082561917
GameObject:
m_ObjectHideFlags: 0

82
popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Stock.prefab
View File

@ -195,6 +195,7 @@ Transform:
- {fileID: 3373136197140018219}
- {fileID: 6773000140537774233}
- {fileID: 8328586562333223833}
- {fileID: 2640383126096438143}
m_Father: {fileID: 7036498054588908229}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -393,3 +394,84 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &9065752651984734903
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2640383126096438143}
- component: {fileID: 4680395383523372758}
m_Layer: 0
m_Name: text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2640383126096438143
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9065752651984734903}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.19, y: -1.05, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5004154229686053151}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4680395383523372758
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9065752651984734903}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 5
m_Sprite: {fileID: 21300000, guid: d2e4ae50bfa33574dbf61988d91f2634, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.08, y: 0.72}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0