Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
This commit is contained in:
koya_15
commit
2f4dd49a6c
|
|
@ -54,8 +54,14 @@ public class CornField : MonoBehaviour
|
|||
// データ
|
||||
var gameData = GameDataManager.GameData;
|
||||
CoinManager.Instance.ChangeCoin(gameData.Coin);
|
||||
HeartMeter.Instance.Initialize();
|
||||
HeartMeter.Instance.SetHeart(gameData.Heart);
|
||||
HeartMeter.Instance.Initialize(gameData.ViewedShopLevel, gameData.Heart);
|
||||
GameDataObserver.Instance.ShopLevelUpdate
|
||||
.Where(x => x)
|
||||
.Subscribe(x =>
|
||||
{
|
||||
LocalCacheManager.Save(ShopLevelUp.DataTag, gameData.ViewedShopLevel + 1);
|
||||
TransitionManager.Instance.LoadSceneAdditive(GameScenes.StoreLevel);
|
||||
}).AddTo(this);
|
||||
counterView.Initialize(gameData.CornSeed);
|
||||
SetData();
|
||||
|
||||
|
|
|
|||
|
|
@ -1023,6 +1023,288 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1344540255
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 785180939}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5062447477614030396, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
value: "\u5927\u91CF\u6CE8\u6587\n\u30EA\u30BB\u30C3\u30C8"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BulkOrderReset
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3}
|
||||
--- !u!114 &1344540256 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 502413859327355263, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1344540255}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1349073831
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 785180939}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4063882079711355622, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5062447477614030396, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Text
|
||||
value: "\u5E97\u8217\u30EC\u30D9\u30EB\n\u6F14\u51FA\n\u30EA\u30BB\u30C3\u30C8"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: LevelUpReset
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5850834825256791800, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: f19992fe2069b4e16b2f83277fb189cb, type: 3}
|
||||
--- !u!114 &1349073832 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 502413859327355263, guid: f19992fe2069b4e16b2f83277fb189cb,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1349073831}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1484413799
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1551,6 +1833,8 @@ MonoBehaviour:
|
|||
resetMaterialButton: {fileID: 1767352104}
|
||||
refillManyProductButton: {fileID: 1651104560}
|
||||
refillLittleProductButton: {fileID: 153639484}
|
||||
bulkOrderResetButton: {fileID: 1344540256}
|
||||
shopLevelUpResetButton: {fileID: 1349073832}
|
||||
fastGrowingToggle: {fileID: 1998240841}
|
||||
manyWalkerToggle: {fileID: 1074704277}
|
||||
coinCount: {fileID: 1484413801}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ public class DebugOptionManager : MonoBehaviour
|
|||
[SerializeField] private Button resetMaterialButton;
|
||||
[SerializeField] private Button refillManyProductButton;
|
||||
[SerializeField] private Button refillLittleProductButton;
|
||||
[SerializeField] private Button bulkOrderResetButton;
|
||||
[SerializeField] private Button shopLevelUpResetButton;
|
||||
[SerializeField] private Toggle fastGrowingToggle;
|
||||
[SerializeField] private Toggle manyWalkerToggle;
|
||||
[SerializeField] private InputField coinCount;
|
||||
|
|
@ -99,6 +101,16 @@ public class DebugOptionManager : MonoBehaviour
|
|||
CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Gold);
|
||||
}).AddTo(this);
|
||||
|
||||
bulkOrderResetButton.OnClickAsObservable().Subscribe(_ =>
|
||||
{
|
||||
gameData.AchievedOrderLevel = 0;
|
||||
}).AddTo(this);
|
||||
|
||||
shopLevelUpResetButton.OnClickAsObservable().Subscribe(_ =>
|
||||
{
|
||||
gameData.ViewedShopLevel = 0;
|
||||
}).AddTo(this);
|
||||
|
||||
coinCount.text = $"{gameData.Coin}";
|
||||
coinCount.OnValueChangedAsObservable().Subscribe(x =>
|
||||
{
|
||||
|
|
|
|||
|
|
@ -27,8 +27,14 @@ public class KitchenManager : MonoBehaviour
|
|||
|
||||
var gameData = GameDataManager.GameData;
|
||||
CoinManager.Instance.ChangeCoin(gameData.Coin);
|
||||
HeartMeter.Instance.Initialize();
|
||||
HeartMeter.Instance.SetHeart(gameData.Heart);
|
||||
HeartMeter.Instance.Initialize(gameData.ViewedShopLevel, gameData.Heart);
|
||||
GameDataObserver.Instance.ShopLevelUpdate
|
||||
.Where(x => x)
|
||||
.Subscribe(x =>
|
||||
{
|
||||
LocalCacheManager.Save(ShopLevelUp.DataTag, gameData.ViewedShopLevel + 1);
|
||||
TransitionManager.Instance.LoadSceneAdditive(GameScenes.StoreLevel);
|
||||
}).AddTo(this);
|
||||
|
||||
kitchenView.Initialize();
|
||||
adButton.gameObject.SetActive(false);
|
||||
|
|
@ -45,9 +51,7 @@ public class KitchenManager : MonoBehaviour
|
|||
kitchenView.SetNormalAnimation();
|
||||
}).AddTo(this);
|
||||
#endif
|
||||
|
||||
TransitionManager.Instance.LoadSceneAdditive(GameScenes.StoreLevel);
|
||||
|
||||
|
||||
// 大量注文
|
||||
var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList<BulkOrderData>(Const.BulkOrderDataSheet);
|
||||
var result = CheckBulkOrder();
|
||||
|
|
|
|||
|
|
@ -22,8 +22,14 @@ public class MarketManager : MonoBehaviour
|
|||
{
|
||||
var gameData = GameDataManager.GameData;
|
||||
CoinManager.Instance.ChangeCoin(gameData.Coin);
|
||||
HeartMeter.Instance.Initialize();
|
||||
HeartMeter.Instance.SetHeart(gameData.Heart);
|
||||
HeartMeter.Instance.Initialize(gameData.ViewedShopLevel, gameData.Heart);
|
||||
GameDataObserver.Instance.ShopLevelUpdate
|
||||
.Where(x => x)
|
||||
.Subscribe(x =>
|
||||
{
|
||||
LocalCacheManager.Save(ShopLevelUp.DataTag, gameData.ViewedShopLevel + 1);
|
||||
TransitionManager.Instance.LoadSceneAdditive(GameScenes.StoreLevel);
|
||||
}).AddTo(this);
|
||||
|
||||
market = Market.Instance;
|
||||
productDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet);
|
||||
|
|
|
|||
|
|
@ -24,8 +24,14 @@ public class ProductManagement : MonoBehaviour
|
|||
state.Value = ManagementState.None;
|
||||
var gameData = GameDataManager.GameData;
|
||||
CoinManager.Instance.ChangeCoin(gameData.Coin);
|
||||
HeartMeter.Instance.Initialize();
|
||||
HeartMeter.Instance.SetHeart(gameData.Heart);
|
||||
HeartMeter.Instance.Initialize(gameData.ViewedShopLevel, gameData.Heart);
|
||||
GameDataObserver.Instance.ShopLevelUpdate
|
||||
.Where(x => x)
|
||||
.Subscribe(x =>
|
||||
{
|
||||
LocalCacheManager.Save(ShopLevelUp.DataTag, gameData.ViewedShopLevel + 1);
|
||||
TransitionManager.Instance.LoadSceneAdditive(GameScenes.StoreLevel);
|
||||
}).AddTo(this);
|
||||
|
||||
// 補充方法設定
|
||||
view.SetRefillType(gameData.RefillMode);
|
||||
|
|
|
|||
|
|
@ -16,8 +16,14 @@ public class Shopping : MonoBehaviour
|
|||
|
||||
var gameData = GameDataManager.GameData;
|
||||
CoinManager.Instance.ChangeCoin(gameData.Coin);
|
||||
HeartMeter.Instance.Initialize();
|
||||
HeartMeter.Instance.SetHeart(gameData.Heart);
|
||||
HeartMeter.Instance.Initialize(gameData.ViewedShopLevel, gameData.Heart);
|
||||
GameDataObserver.Instance.ShopLevelUpdate
|
||||
.Where(x => x)
|
||||
.Subscribe(x =>
|
||||
{
|
||||
LocalCacheManager.Save(ShopLevelUp.DataTag, gameData.ViewedShopLevel + 1);
|
||||
TransitionManager.Instance.LoadSceneAdditive(GameScenes.StoreLevel);
|
||||
}).AddTo(this);
|
||||
|
||||
// 一覧データ
|
||||
var shopDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopData>(Const.ShopDataSheet);
|
||||
|
|
|
|||
Loading…
Reference in New Issue