ミッション報酬通知切り替え追加
This commit is contained in:
parent
865f82ab5c
commit
9b5a262059
|
|
@ -1521,6 +1521,7 @@ MonoBehaviour:
|
||||||
button: {fileID: 2660639678931990177}
|
button: {fileID: 2660639678931990177}
|
||||||
onObject: {fileID: 2660639677505249334}
|
onObject: {fileID: 2660639677505249334}
|
||||||
offObject: {fileID: 2660639678931990179}
|
offObject: {fileID: 2660639678931990179}
|
||||||
|
indicator: {fileID: 2129846913188432060}
|
||||||
--- !u!1 &2660639677099381259
|
--- !u!1 &2660639677099381259
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2576,6 +2577,7 @@ MonoBehaviour:
|
||||||
button: {fileID: 2660639677869302037}
|
button: {fileID: 2660639677869302037}
|
||||||
onObject: {fileID: 2660639678013920435}
|
onObject: {fileID: 2660639678013920435}
|
||||||
offObject: {fileID: 2660639677869302039}
|
offObject: {fileID: 2660639677869302039}
|
||||||
|
indicator: {fileID: 6410983111595538124}
|
||||||
--- !u!1 &2660639678206855381
|
--- !u!1 &2660639678206855381
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -6607,6 +6609,12 @@ 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 &6410983111595538124 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 2686639074240930400}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!224 &6170226839459316569 stripped
|
--- !u!224 &6170226839459316569 stripped
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
|
m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
|
||||||
|
|
@ -6878,3 +6886,9 @@ RectTransform:
|
||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 6934984148779113488}
|
m_PrefabInstance: {fileID: 6934984148779113488}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &2129846913188432060 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 6934984148779113488}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
|
||||||
|
|
@ -831,7 +831,6 @@ GameObject:
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 137127163878687691}
|
- component: {fileID: 137127163878687691}
|
||||||
- component: {fileID: 252357910248425631}
|
- component: {fileID: 252357910248425631}
|
||||||
- component: {fileID: 3928365105026016678}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Header
|
m_Name: Header
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
|
|
@ -876,19 +875,7 @@ MonoBehaviour:
|
||||||
settingButton: {fileID: 137127162501263384}
|
settingButton: {fileID: 137127162501263384}
|
||||||
missionButton: {fileID: 7425175309417248097}
|
missionButton: {fileID: 7425175309417248097}
|
||||||
informationButton: {fileID: 137127164298331678}
|
informationButton: {fileID: 137127164298331678}
|
||||||
--- !u!114 &3928365105026016678
|
missionIndicator: {fileID: 1937919369583800779}
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 137127163878687690}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: d98a3722b2a5d49c28715cd9366799c3, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
debugOptionButton: {fileID: 137127162501263384}
|
|
||||||
--- !u!1 &137127164225778479
|
--- !u!1 &137127164225778479
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -2135,6 +2122,12 @@ 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 &1937919369583800779 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 9056949049436837036, guid: f8587bb162250fa48947d648e934781e,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 7445681957362115943}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!224 &1710717862299550814 stripped
|
--- !u!224 &1710717862299550814 stripped
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
|
m_CorrespondingSourceObject: {fileID: 8136263580696535353, guid: f8587bb162250fa48947d648e934781e,
|
||||||
|
|
|
||||||
|
|
@ -77,4 +77,19 @@ public class MissionListView : MonoBehaviour
|
||||||
{
|
{
|
||||||
selectedTab.SetValueAndForceNotify(category);
|
selectedTab.SetValueAndForceNotify(category);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SetIndicator(MissionCategory category, bool active)
|
||||||
|
{
|
||||||
|
switch (category)
|
||||||
|
{
|
||||||
|
case MissionCategory.Normal:
|
||||||
|
normalTab.SetIndicator(active);
|
||||||
|
break;
|
||||||
|
case MissionCategory.Daily:
|
||||||
|
dailyTab.SetIndicator(active);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(category), category, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,11 +8,16 @@ public class MissionTabView : MonoBehaviour
|
||||||
[SerializeField] private Button button;
|
[SerializeField] private Button button;
|
||||||
[SerializeField] private GameObject onObject;
|
[SerializeField] private GameObject onObject;
|
||||||
[SerializeField] private GameObject offObject;
|
[SerializeField] private GameObject offObject;
|
||||||
|
[SerializeField] private GameObject indicator;
|
||||||
public IObservable<Unit> ClickObservable => button.OnClickAsObservable().TakeUntilDestroy(this);
|
public IObservable<Unit> ClickObservable => button.OnClickAsObservable().TakeUntilDestroy(this);
|
||||||
public void SetToggle(bool active)
|
public void SetToggle(bool active)
|
||||||
{
|
{
|
||||||
onObject.SetActive(active);
|
onObject.SetActive(active);
|
||||||
offObject.SetActive(!active);
|
offObject.SetActive(!active);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SetIndicator(bool active)
|
||||||
|
{
|
||||||
|
indicator.SetActive(active);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using UniRx;
|
using UniRx;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.Analytics;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
public class HeaderManager : MonoBehaviour
|
public class HeaderManager : MonoBehaviour
|
||||||
|
|
@ -8,6 +11,7 @@ public class HeaderManager : MonoBehaviour
|
||||||
[SerializeField] private Button settingButton;
|
[SerializeField] private Button settingButton;
|
||||||
[SerializeField] private Button missionButton;
|
[SerializeField] private Button missionButton;
|
||||||
[SerializeField] private Button informationButton;
|
[SerializeField] private Button informationButton;
|
||||||
|
[SerializeField] private GameObject missionIndicator;
|
||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue