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

カスタマーの設定値を一部ScriptableObjectに変更

This commit is contained in:
kimura 2022-10-04 15:53:45 +09:00
parent f890ad00fa
commit ab19a2a70c
9 changed files with 97 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
popcorn/Assets/MyGame/Resources/Data/CustomerData.asset Normal file
View File

@ -0,0 +1,38 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
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: eee40f4ea08e42fab5bf3ea8810f972a, type: 3}
m_Name: CustomerData
m_EditorClassIdentifier:
normalCustomerList:
- {fileID: 2081206165642927681, guid: 8c6dcd9482c51504e89ba42234369eda, type: 3}
- {fileID: 3417146906192995648, guid: af261bf183461af4b92b31a8649f1255, type: 3}
- {fileID: 7335308589943261866, guid: 8119ab8ce92a2484e83fa24bd7e91a7f, type: 3}
- {fileID: 413810629974474182, guid: b2e16ea88a942194fba4f20587f878d6, type: 3}
- {fileID: 7387534375894606070, guid: d7cea2d0458d10045a554a2fd1d5fde6, type: 3}
- {fileID: 2956205987963330084, guid: 2500a61ff79089d4da546f201f081e47, type: 3}
- {fileID: 4003975052009544272, guid: 324a7da4fcc328b4f86c4b8187774494, type: 3}
- {fileID: 6611440640265939248, guid: 7b6b18cba9150a1489f4b43c7dc96d01, type: 3}
- {fileID: 4805680105836285077, guid: 52eaa7893b55de0429402c694cde7077, type: 3}
- {fileID: 1961958092796897608, guid: 2d382a736a77d094ab8bd5337378ef12, type: 3}
- {fileID: 5217128672583935175, guid: 2b6084fdf652c6243b87c13c91f3b853, type: 3}
- {fileID: 1495806834793429147, guid: aee5c283a9302b749b3d37a96fcfdda2, type: 3}
- {fileID: 6205875053208953292, guid: 82c0cba8f34403145be5233f1a5c3068, type: 3}
- {fileID: 1289510962161473022, guid: 362f5d085a6f03448ab7123ee6592fc5, type: 3}
- {fileID: 3410656625090842591, guid: d3e920d4dcd68904db3aee438806ccc9, type: 3}
- {fileID: 8951347046735010126, guid: db654393793a67d45a7d0b70a68b73a6, type: 3}
- {fileID: 5939373664598446035, guid: d822fed75e272b5478a8ba9c9c591435, type: 3}
- {fileID: 5110027364233171103, guid: c07d09141aed9ea4d8f5fb012b316b43, type: 3}
- {fileID: 2961800609380067762, guid: fce9702bad3abf54691591f9720488fa, type: 3}
- {fileID: 1134751513859088931, guid: 09a4786fa1ab00e4b9c5bf9cebf256bc, type: 3}
- {fileID: 1289510962161473022, guid: 00e0cbb85389d424f9f75bbd5db123a8, type: 3}
specialCustomerList:
- {fileID: 5301193561386860206, guid: 72f4243f8f258bc48b42e3ae5e1ba2b5, type: 3}

8
popcorn/Assets/MyGame/Resources/Data/CustomerData.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 92d0a853785db4a648ead872e3117321
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

17
popcorn/Assets/MyGame/Resources/Data/CustomerSetting.asset Normal file
View File

@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
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: 573c945685b348baa1a1ba6aeeb38714, type: 3}
m_Name: CustomerSetting
m_EditorClassIdentifier:
specialOrderCount: 5
walkerSpecialRate: 0.0009
customerSpecialRate: 0.00001

8
popcorn/Assets/MyGame/Resources/Data/CustomerSetting.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d5665630d9dd54babb063c076855bdb3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

50
popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab
View File

@ -259,9 +259,8 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 3320409656134683753} - component: {fileID: 3320409656134683753}
- component: {fileID: 680149628799017792} - component: {fileID: 680149628799017792}
- component: {fileID: 7815373139353427344}
- component: {fileID: 6660189001731691529} - component: {fileID: 6660189001731691529}
- component: {fileID: 3170654326839881890} - component: {fileID: 5425886867650670128}
m_Layer: 0 m_Layer: 0
m_Name: MarketManager m_Name: MarketManager
m_TagString: Untagged m_TagString: Untagged
@ -303,21 +302,6 @@ MonoBehaviour:
vipCustomerCount: 6 vipCustomerCount: 6
vipCustomerInterval: 3 vipCustomerInterval: 3
tastingCustomerInterval: 5 tastingCustomerInterval: 5
--- !u!114 &7815373139353427344
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: 573c945685b348baa1a1ba6aeeb38714, type: 3}
m_Name:
m_EditorClassIdentifier:
specialOrderCount: 5
walkerSpecialRate: 0.009
customerSpecialRate: 0.0001
--- !u!114 &6660189001731691529 --- !u!114 &6660189001731691529
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -332,11 +316,11 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
customerFlow: {fileID: 680149628799017792} customerFlow: {fileID: 680149628799017792}
orderPosisionObject: {fileID: 8461447348824790522} orderPosisionObject: {fileID: 8461447348824790522}
customerData: {fileID: 3170654326839881890} customerData: {fileID: 11400000, guid: 92d0a853785db4a648ead872e3117321, type: 2}
customerSetting: {fileID: 7815373139353427344} customerSetting: {fileID: 11400000, guid: d5665630d9dd54babb063c076855bdb3, type: 2}
customerControllerPrefab: {fileID: 5715829407227760309, guid: 6fbb038c9aae840f2bea57bce30740f7, customerControllerPrefab: {fileID: 5715829407227760309, guid: 6fbb038c9aae840f2bea57bce30740f7,
type: 3} type: 3}
--- !u!114 &3170654326839881890 --- !u!114 &5425886867650670128
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -345,32 +329,10 @@ MonoBehaviour:
m_GameObject: {fileID: 8739647597683206087} m_GameObject: {fileID: 8739647597683206087}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eee40f4ea08e42fab5bf3ea8810f972a, type: 3} m_Script: {fileID: 11500000, guid: 314dd9be490e4a168cc6b93170088eeb, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
normalCustomerList: customerSetting: {fileID: 11400000, guid: d5665630d9dd54babb063c076855bdb3, type: 2}
- {fileID: 2081206165642927681, guid: 8c6dcd9482c51504e89ba42234369eda, type: 3}
- {fileID: 3417146906192995648, guid: af261bf183461af4b92b31a8649f1255, type: 3}
- {fileID: 7335308589943261866, guid: 8119ab8ce92a2484e83fa24bd7e91a7f, type: 3}
- {fileID: 413810629974474182, guid: b2e16ea88a942194fba4f20587f878d6, type: 3}
- {fileID: 7387534375894606070, guid: d7cea2d0458d10045a554a2fd1d5fde6, type: 3}
- {fileID: 2956205987963330084, guid: 2500a61ff79089d4da546f201f081e47, type: 3}
- {fileID: 4003975052009544272, guid: 324a7da4fcc328b4f86c4b8187774494, type: 3}
- {fileID: 6611440640265939248, guid: 7b6b18cba9150a1489f4b43c7dc96d01, type: 3}
- {fileID: 4805680105836285077, guid: 52eaa7893b55de0429402c694cde7077, type: 3}
- {fileID: 1961958092796897608, guid: 2d382a736a77d094ab8bd5337378ef12, type: 3}
- {fileID: 5217128672583935175, guid: 2b6084fdf652c6243b87c13c91f3b853, type: 3}
- {fileID: 1495806834793429147, guid: aee5c283a9302b749b3d37a96fcfdda2, type: 3}
- {fileID: 6205875053208953292, guid: 82c0cba8f34403145be5233f1a5c3068, type: 3}
- {fileID: 1289510962161473022, guid: 362f5d085a6f03448ab7123ee6592fc5, type: 3}
- {fileID: 3410656625090842591, guid: d3e920d4dcd68904db3aee438806ccc9, type: 3}
- {fileID: 8951347046735010126, guid: db654393793a67d45a7d0b70a68b73a6, type: 3}
- {fileID: 5939373664598446035, guid: d822fed75e272b5478a8ba9c9c591435, type: 3}
- {fileID: 5110027364233171103, guid: c07d09141aed9ea4d8f5fb012b316b43, type: 3}
- {fileID: 2961800609380067762, guid: fce9702bad3abf54691591f9720488fa, type: 3}
- {fileID: 1134751513859088931, guid: 09a4786fa1ab00e4b9c5bf9cebf256bc, type: 3}
specialCustomerList:
- {fileID: 5301193561386860206, guid: 72f4243f8f258bc48b42e3ae5e1ba2b5, type: 3}
--- !u!1001 &8914311020904666258 --- !u!1001 &8914311020904666258
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

3
popcorn/Assets/MyGame/Scenes/Title/Scripts/Title.cs
View File

@ -12,6 +12,7 @@ public class Title : MonoBehaviour
[Space] [Space]
[SerializeField] private GameObject startObject; [SerializeField] private GameObject startObject;
[SerializeField] private CustomerData customerData; [SerializeField] private CustomerData customerData;
[SerializeField] private CustomerSetting customerSetting;
[SerializeField] private CustomerController customerControllerPrefab; [SerializeField] private CustomerController customerControllerPrefab;
[SerializeField] private MarketView marketView; [SerializeField] private MarketView marketView;
// Start is called before the first frame update // Start is called before the first frame update
@ -51,7 +52,7 @@ public class Title : MonoBehaviour
.Subscribe(t => .Subscribe(t =>
{ {
// 一般客orセレブ // 一般客orセレブ
var (isSpecial, orderCount) = Market.Instance.GetCustomerData(CustomerType.Walker); var (isSpecial, orderCount) = customerSetting.GetCustomerData(CustomerType.Walker);
// 複数パターンある場合ChooseRandom // 複数パターンある場合ChooseRandom
var prefab = isSpecial ? customerData.ChooseSpecialPrefab() : customerData.ChooseNormalPrefab(); var prefab = isSpecial ? customerData.ChooseSpecialPrefab() : customerData.ChooseNormalPrefab();

39
popcorn/Assets/MyGame/Scenes/Title/Title.unity
View File

@ -8599,7 +8599,6 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1628914679} - component: {fileID: 1628914679}
- component: {fileID: 1628914678} - component: {fileID: 1628914678}
- component: {fileID: 1628914680}
m_Layer: 0 m_Layer: 0
m_Name: Manager m_Name: Manager
m_TagString: Untagged m_TagString: Untagged
@ -8622,7 +8621,8 @@ MonoBehaviour:
customerInterval: customerInterval:
value: 3 value: 3
startObject: {fileID: 1863899077} startObject: {fileID: 1863899077}
customerData: {fileID: 1628914680} customerData: {fileID: 11400000, guid: 92d0a853785db4a648ead872e3117321, type: 2}
customerSetting: {fileID: 11400000, guid: d5665630d9dd54babb063c076855bdb3, type: 2}
customerControllerPrefab: {fileID: 1165589899} customerControllerPrefab: {fileID: 1165589899}
marketView: {fileID: 526008900} marketView: {fileID: 526008900}
--- !u!4 &1628914679 --- !u!4 &1628914679
@ -8641,41 +8641,6 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 6 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1628914680
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1628914677}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eee40f4ea08e42fab5bf3ea8810f972a, type: 3}
m_Name:
m_EditorClassIdentifier:
normalCustomerList:
- {fileID: 2081206165642927681, guid: 8c6dcd9482c51504e89ba42234369eda, type: 3}
- {fileID: 3417146906192995648, guid: af261bf183461af4b92b31a8649f1255, type: 3}
- {fileID: 7335308589943261866, guid: 8119ab8ce92a2484e83fa24bd7e91a7f, type: 3}
- {fileID: 413810629974474182, guid: b2e16ea88a942194fba4f20587f878d6, type: 3}
- {fileID: 7387534375894606070, guid: d7cea2d0458d10045a554a2fd1d5fde6, type: 3}
- {fileID: 2956205987963330084, guid: 2500a61ff79089d4da546f201f081e47, type: 3}
- {fileID: 4003975052009544272, guid: 324a7da4fcc328b4f86c4b8187774494, type: 3}
- {fileID: 6611440640265939248, guid: 7b6b18cba9150a1489f4b43c7dc96d01, type: 3}
- {fileID: 4805680105836285077, guid: 52eaa7893b55de0429402c694cde7077, type: 3}
- {fileID: 1961958092796897608, guid: 2d382a736a77d094ab8bd5337378ef12, type: 3}
- {fileID: 5217128672583935175, guid: 2b6084fdf652c6243b87c13c91f3b853, type: 3}
- {fileID: 1495806834793429147, guid: aee5c283a9302b749b3d37a96fcfdda2, type: 3}
- {fileID: 6205875053208953292, guid: 82c0cba8f34403145be5233f1a5c3068, type: 3}
- {fileID: 1289510962161473022, guid: 362f5d085a6f03448ab7123ee6592fc5, type: 3}
- {fileID: 3410656625090842591, guid: d3e920d4dcd68904db3aee438806ccc9, type: 3}
- {fileID: 8951347046735010126, guid: db654393793a67d45a7d0b70a68b73a6, type: 3}
- {fileID: 5939373664598446035, guid: d822fed75e272b5478a8ba9c9c591435, type: 3}
- {fileID: 5110027364233171103, guid: c07d09141aed9ea4d8f5fb012b316b43, type: 3}
- {fileID: 2961800609380067762, guid: fce9702bad3abf54691591f9720488fa, type: 3}
- {fileID: 1134751513859088931, guid: 09a4786fa1ab00e4b9c5bf9cebf256bc, type: 3}
specialCustomerList:
- {fileID: 5301193561386860206, guid: 72f4243f8f258bc48b42e3ae5e1ba2b5, type: 3}
--- !u!114 &1637106857 --- !u!114 &1637106857
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

24
popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerData.cs
View File

@ -1,18 +1,22 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
public class CustomerData : MonoBehaviour namespace MyGame.Scenes.marketing.Scripts
{ {
[SerializeField] private List<CustomerAnimator> normalCustomerList; [CreateAssetMenu(fileName = "Resources/Data/CustomerData", menuName = "Popcorn/CreateCustomerData")]
[SerializeField] private List<CustomerAnimator> specialCustomerList; public class CustomerData : ScriptableObject
public CustomerAnimator ChooseNormalPrefab()
{ {
return normalCustomerList.RandomChoose(); [SerializeField] private List<CustomerAnimator> normalCustomerList;
} [SerializeField] private List<CustomerAnimator> specialCustomerList;
public CustomerAnimator ChooseSpecialPrefab() public CustomerAnimator ChooseNormalPrefab()
{ {
return specialCustomerList.RandomChoose(); return normalCustomerList.RandomChoose();
}
public CustomerAnimator ChooseSpecialPrefab()
{
return specialCustomerList.RandomChoose();
}
} }
} }

3
popcorn/Assets/MyGame/Scenes/marketing/Scripts/CustomerSetting.cs
View File

@ -5,7 +5,8 @@ using Random = UnityEngine.Random;
namespace MyGame.Scenes.marketing.Scripts namespace MyGame.Scenes.marketing.Scripts
{ {
public class CustomerSetting : MonoBehaviour [CreateAssetMenu(fileName = "Resources/Data/CustomerSetting", menuName = "Popcorn/CreateCustomerSetting")]
public class CustomerSetting : ScriptableObject
{ {
[SerializeField] private int specialOrderCount = 5; [SerializeField] private int specialOrderCount = 5;
[SerializeField] private float walkerSpecialRate = .01f; [SerializeField] private float walkerSpecialRate = .01f;