From 8ebe6a287ea6074c756e40bd067ed04afc7ed9e1 Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 4 Oct 2022 16:39:26 +0900 Subject: [PATCH] =?UTF-8?q?Market=E3=82=92=E9=9D=9E=E3=82=B7=E3=83=B3?= =?UTF-8?q?=E3=82=B0=E3=83=AB=E3=83=88=E3=83=B3=E5=8C=96WorldMarketManager?= =?UTF-8?q?=E3=81=AB=E3=82=A4=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=B3=E3=82=B9?= =?UTF-8?q?=E4=BD=9C=E6=88=90=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Resources/DontDestroyObject.prefab | 131 ++++----------- .../marketing/Prefabs/MarketController.prefab | 153 ++++++++++++++++++ .../Prefabs/MarketController.prefab.meta | 7 + .../MyGame/Scenes/marketing/Scripts/Market.cs | 2 +- 4 files changed, 190 insertions(+), 103 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MarketController.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MarketController.prefab.meta diff --git a/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab b/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab index 5ee2cdba..0012762b 100644 --- a/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab +++ b/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab @@ -101,6 +101,7 @@ GameObject: - component: {fileID: 7825871007626831899} - component: {fileID: 7297614168111566820} - component: {fileID: 2346543539818410046} + - component: {fileID: 7225273952590096929} m_Layer: 0 m_Name: DontDestroyObject m_TagString: Untagged @@ -249,168 +250,94 @@ MonoBehaviour: m_EditorClassIdentifier: updateTiming: 2 saveTiming: 10 ---- !u!1 &8739647597683206087 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3320409656134683753} - - component: {fileID: 680149628799017792} - - component: {fileID: 6660189001731691529} - - component: {fileID: 5425886867650670128} - m_Layer: 0 - m_Name: MarketManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3320409656134683753 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8739647597683206087} - 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: 2507803949588325386} - m_Father: {fileID: 3667080857874733261} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &680149628799017792 + shopCustomizeCoinTiming: 86400 + targetCount: 3 +--- !u!114 &7225273952590096929 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8739647597683206087} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 772e0346311a433fb714573f207813d2, type: 3} - m_Name: - m_EditorClassIdentifier: - walkerInterval: 13 - adWalkerDuration: 60 - adWalkerCount: 14 - vipCustomerCount: 6 - vipCustomerInterval: 3 - tastingCustomerInterval: 5 ---- !u!114 &6660189001731691529 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8739647597683206087} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cf4a253e4bfcb47f18e7d6f28af64b01, type: 3} - m_Name: - m_EditorClassIdentifier: - customerFlow: {fileID: 680149628799017792} - orderPosisionObject: {fileID: 8461447348824790522} - customerData: {fileID: 11400000, guid: 92d0a853785db4a648ead872e3117321, type: 2} - customerSetting: {fileID: 11400000, guid: d5665630d9dd54babb063c076855bdb3, type: 2} - customerControllerPrefab: {fileID: 5715829407227760309, guid: 6fbb038c9aae840f2bea57bce30740f7, - type: 3} ---- !u!114 &5425886867650670128 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8739647597683206087} + m_GameObject: {fileID: 3459593390050872226} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 314dd9be490e4a168cc6b93170088eeb, type: 3} m_Name: m_EditorClassIdentifier: - customerSetting: {fileID: 11400000, guid: d5665630d9dd54babb063c076855bdb3, type: 2} ---- !u!1001 &8914311020904666258 + marketPrefab: {fileID: 3419531796907098004, guid: 6fe4474d882fe472e8814b5115a5be32, + type: 3} +--- !u!1001 &8293695997631179677 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 3320409656134683753} + m_TransformParent: {fileID: 3667080857874733261} m_Modifications: - - target: {fileID: 1069859090919850344, guid: 49f4b2509378048e7b7a5c6c0674be9f, + - target: {fileID: 743190412606458970, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} propertyPath: m_Name - value: OrderPositions + value: MarketManager objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + - target: {fileID: 6705110442270648308, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + - target: {fileID: 6705110442270648308, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + - target: {fileID: 6705110442270648308, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + - target: {fileID: 6705110442270648308, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + - target: {fileID: 6705110442270648308, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + - target: {fileID: 6705110442270648308, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + - target: {fileID: 6705110442270648308, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + - target: {fileID: 6705110442270648308, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + - target: {fileID: 6705110442270648308, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + - target: {fileID: 6705110442270648308, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + - target: {fileID: 6705110442270648308, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 49f4b2509378048e7b7a5c6c0674be9f, type: 3} ---- !u!4 &2507803949588325386 stripped + m_SourcePrefab: {fileID: 100100000, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} +--- !u!4 &3320409656134683753 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + m_CorrespondingSourceObject: {fileID: 6705110442270648308, guid: 6fe4474d882fe472e8814b5115a5be32, type: 3} - m_PrefabInstance: {fileID: 8914311020904666258} - m_PrefabAsset: {fileID: 0} ---- !u!1 &8461447348824790522 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1069859090919850344, guid: 49f4b2509378048e7b7a5c6c0674be9f, - type: 3} - m_PrefabInstance: {fileID: 8914311020904666258} + m_PrefabInstance: {fileID: 8293695997631179677} m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MarketController.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MarketController.prefab new file mode 100644 index 00000000..ee438bc1 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MarketController.prefab @@ -0,0 +1,153 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &743190412606458970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6705110442270648308} + - component: {fileID: 8820652722157996253} + - component: {fileID: 3419531796907098004} + m_Layer: 0 + m_Name: MarketController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6705110442270648308 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 743190412606458970} + 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: 5896516993211305879} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8820652722157996253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 743190412606458970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 772e0346311a433fb714573f207813d2, type: 3} + m_Name: + m_EditorClassIdentifier: + walkerInterval: 13 + adWalkerDuration: 60 + adWalkerCount: 14 + vipCustomerCount: 6 + vipCustomerInterval: 3 + tastingCustomerInterval: 5 +--- !u!114 &3419531796907098004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 743190412606458970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cf4a253e4bfcb47f18e7d6f28af64b01, type: 3} + m_Name: + m_EditorClassIdentifier: + customerFlow: {fileID: 8820652722157996253} + orderPosisionObject: {fileID: 465059441561960039} + customerData: {fileID: 11400000, guid: 92d0a853785db4a648ead872e3117321, type: 2} + customerSetting: {fileID: 11400000, guid: d5665630d9dd54babb063c076855bdb3, type: 2} + customerControllerPrefab: {fileID: 5715829407227760309, guid: 6fbb038c9aae840f2bea57bce30740f7, + type: 3} +--- !u!1001 &625118771266060047 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6705110442270648308} + m_Modifications: + - target: {fileID: 1069859090919850344, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_Name + value: OrderPositions + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 49f4b2509378048e7b7a5c6c0674be9f, type: 3} +--- !u!1 &465059441561960039 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1069859090919850344, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + m_PrefabInstance: {fileID: 625118771266060047} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5896516993211305879 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6447040043672924312, guid: 49f4b2509378048e7b7a5c6c0674be9f, + type: 3} + m_PrefabInstance: {fileID: 625118771266060047} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MarketController.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MarketController.prefab.meta new file mode 100644 index 00000000..654891ce --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MarketController.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6fe4474d882fe472e8814b5115a5be32 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs index 27508ca2..3207dcc8 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/Market.cs @@ -17,7 +17,7 @@ public enum ShopState Close, } -public class Market : SingletonMonoBehaviour +public class Market : MonoBehaviour { // 購入時アニメーションタイミング private static readonly float waitSellTime = 1.5f;