fix footer ボタンアクション追加
This commit is contained in:
parent
cc1f016f0d
commit
00828de1dd
|
|
@ -87,14 +87,13 @@ GameObject:
|
||||||
- component: {fileID: 8592562362772959461}
|
- component: {fileID: 8592562362772959461}
|
||||||
- component: {fileID: 4731668520893469935}
|
- component: {fileID: 4731668520893469935}
|
||||||
- component: {fileID: 5058048876301857436}
|
- component: {fileID: 5058048876301857436}
|
||||||
- component: {fileID: 1417305832890859795}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Button_minigame_key
|
m_Name: Button_minigame_key
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &5534004789596893339
|
--- !u!224 &5534004789596893339
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -211,22 +210,6 @@ MonoBehaviour:
|
||||||
randomPlaySEFilenames: []
|
randomPlaySEFilenames: []
|
||||||
randomPlayVoiceFilenames: []
|
randomPlayVoiceFilenames: []
|
||||||
vibrationType: 0
|
vibrationType: 0
|
||||||
--- !u!114 &1417305832890859795
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 296169392965646696}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: a0dc14a074a045e692da5b06f4ebf359, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
onSprite: {fileID: 21300000, guid: d3e596bc03ab54cb89bf61b9ebb26053, type: 3}
|
|
||||||
offSprite: {fileID: 21300000, guid: 1a7dcb2763dc8d44897ac8b797f1bd3a, type: 3}
|
|
||||||
onObject: {fileID: 0}
|
|
||||||
offObject: {fileID: 1986134928651511565}
|
|
||||||
--- !u!1 &648754210011435706
|
--- !u!1 &648754210011435706
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -321,7 +304,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 0
|
m_IsActive: 1
|
||||||
--- !u!224 &1914405537612263520
|
--- !u!224 &1914405537612263520
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -454,7 +437,7 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
onSprite: {fileID: 21300000, guid: d3e596bc03ab54cb89bf61b9ebb26053, type: 3}
|
onSprite: {fileID: 21300000, guid: d3e596bc03ab54cb89bf61b9ebb26053, type: 3}
|
||||||
offSprite: {fileID: 21300000, guid: 1a7dcb2763dc8d44897ac8b797f1bd3a, type: 3}
|
offSprite: {fileID: 21300000, guid: 1a7dcb2763dc8d44897ac8b797f1bd3a, type: 3}
|
||||||
onObject: {fileID: 0}
|
onObject: {fileID: 5336892983959747644}
|
||||||
offObject: {fileID: 6657292773465967299}
|
offObject: {fileID: 6657292773465967299}
|
||||||
--- !u!1 &1397606787759984249
|
--- !u!1 &1397606787759984249
|
||||||
GameObject:
|
GameObject:
|
||||||
|
|
@ -1598,6 +1581,8 @@ MonoBehaviour:
|
||||||
stockButton: {fileID: 5274539976409466502}
|
stockButton: {fileID: 5274539976409466502}
|
||||||
saleButton: {fileID: 3508757909112374925}
|
saleButton: {fileID: 3508757909112374925}
|
||||||
productManagementButton: {fileID: 4134779366559125937}
|
productManagementButton: {fileID: 4134779366559125937}
|
||||||
|
scrollGameButton: {fileID: 377651453068464259}
|
||||||
|
scrollGameLockedButton: {fileID: 4731668520893469935}
|
||||||
stockNotifyIcon: {fileID: 2430043917671370164}
|
stockNotifyIcon: {fileID: 2430043917671370164}
|
||||||
kitchenNotifyIcon: {fileID: 4699855437215309545}
|
kitchenNotifyIcon: {fileID: 4699855437215309545}
|
||||||
--- !u!1 &3310671341662576997
|
--- !u!1 &3310671341662576997
|
||||||
|
|
@ -5115,15 +5100,15 @@ PrefabInstance:
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: f8587bb162250fa48947d648e934781e, type: 3}
|
||||||
--- !u!1 &2430043917671370164 stripped
|
|
||||||
GameObject:
|
|
||||||
m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e,
|
|
||||||
type: 3}
|
|
||||||
m_PrefabInstance: {fileID: 6632112567178762520}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
--- !u!224 &3233636912317429793 stripped
|
--- !u!224 &3233636912317429793 stripped
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
|
m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
|
||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 6632112567178762520}
|
m_PrefabInstance: {fileID: 6632112567178762520}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &2430043917671370164 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 6632112567178762520}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ public static class Const {
|
||||||
public static readonly int DailyMissionCompleteRewardShopCustomizeCoin = 5;
|
public static readonly int DailyMissionCompleteRewardShopCustomizeCoin = 5;
|
||||||
public static readonly int ScrollGameDailyPlayMaxCount = 4;
|
public static readonly int ScrollGameDailyPlayMaxCount = 4;
|
||||||
public static readonly int ScrollGameDailyResetOffsetHours = 0; // 翌日0時基準
|
public static readonly int ScrollGameDailyResetOffsetHours = 0; // 翌日0時基準
|
||||||
|
public static readonly int ScrollGameAvailableLevel = 8;
|
||||||
|
|
||||||
// tag
|
// tag
|
||||||
public static readonly string GameDataTag = "GameData";
|
public static readonly string GameDataTag = "GameData";
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,8 @@ public class FooterManager : MonoBehaviour
|
||||||
[SerializeField] private FooterButton stockButton;
|
[SerializeField] private FooterButton stockButton;
|
||||||
[SerializeField] private FooterButton saleButton;
|
[SerializeField] private FooterButton saleButton;
|
||||||
[SerializeField] private FooterButton productManagementButton;
|
[SerializeField] private FooterButton productManagementButton;
|
||||||
|
[SerializeField] private FooterButton scrollGameButton;
|
||||||
|
[SerializeField] private Button scrollGameLockedButton;
|
||||||
[SerializeField] private GameObject stockNotifyIcon;
|
[SerializeField] private GameObject stockNotifyIcon;
|
||||||
[SerializeField] private GameObject kitchenNotifyIcon;
|
[SerializeField] private GameObject kitchenNotifyIcon;
|
||||||
|
|
||||||
|
|
@ -27,12 +29,14 @@ public class FooterManager : MonoBehaviour
|
||||||
stockButton.SetSelected(currentSceneName == GameScenes.shopping);
|
stockButton.SetSelected(currentSceneName == GameScenes.shopping);
|
||||||
saleButton.SetSelected(currentSceneName == GameScenes.marketing);
|
saleButton.SetSelected(currentSceneName == GameScenes.marketing);
|
||||||
productManagementButton.SetSelected(currentSceneName == GameScenes.ProductManagement);
|
productManagementButton.SetSelected(currentSceneName == GameScenes.ProductManagement);
|
||||||
|
scrollGameButton.SetSelected(currentSceneName == GameScenes.MiniGame);
|
||||||
Observable.Merge(
|
Observable.Merge(
|
||||||
kitchenButton.ClickObservable.Select(_ => GameScenes.Main),
|
kitchenButton.ClickObservable.Select(_ => GameScenes.Main),
|
||||||
fieldButton.ClickObservable.Select(_ => GameScenes.CornField),
|
fieldButton.ClickObservable.Select(_ => GameScenes.CornField),
|
||||||
stockButton.ClickObservable.Select(_ => GameScenes.shopping),
|
stockButton.ClickObservable.Select(_ => GameScenes.shopping),
|
||||||
saleButton.ClickObservable.Select(_ => GameScenes.marketing),
|
saleButton.ClickObservable.Select(_ => GameScenes.marketing),
|
||||||
productManagementButton.ClickObservable.Select(_ => GameScenes.ProductManagement))
|
productManagementButton.ClickObservable.Select(_ => GameScenes.ProductManagement),
|
||||||
|
scrollGameButton.ClickObservable.Select(_ => GameScenes.MiniGame))
|
||||||
.Take(1)
|
.Take(1)
|
||||||
.Subscribe(x =>
|
.Subscribe(x =>
|
||||||
{
|
{
|
||||||
|
|
@ -41,5 +45,16 @@ public class FooterManager : MonoBehaviour
|
||||||
|
|
||||||
kitchenNotifyIcon.SetActive(AutoCookView.CheckComplete());
|
kitchenNotifyIcon.SetActive(AutoCookView.CheckComplete());
|
||||||
stockNotifyIcon.SetActive(Shopping.CheckEarnedRecipe());
|
stockNotifyIcon.SetActive(Shopping.CheckEarnedRecipe());
|
||||||
|
|
||||||
|
var scrollGameAvailable = GameDataManager.GameData.ViewedShopLevel >= Const.ScrollGameAvailableLevel;
|
||||||
|
scrollGameButton.gameObject.SetActive(scrollGameAvailable);
|
||||||
|
scrollGameLockedButton.gameObject.SetActive(!scrollGameAvailable);
|
||||||
|
scrollGameLockedButton.OnClickAsObservable()
|
||||||
|
.Where(_ => !scrollGameAvailable)
|
||||||
|
.ThrottleFirst(TimeSpan.FromSeconds(.2f))
|
||||||
|
.Subscribe(_ =>
|
||||||
|
{
|
||||||
|
// dialog
|
||||||
|
}).AddTo(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue