From ef6d56b13505b768f79287e71c987fa3f77de288 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 14 Oct 2022 12:07:17 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=9F=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E3=82=BF=E3=83=96=E3=81=AB=E9=83=BD=E5=B8=82=E3=82=A2=E3=82=A4?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Main/Prefabs/Mission/MissionCanvas.prefab | 242 ++++++++++++------ .../Scenes/Main/Scripts/MissionListView.cs | 5 + .../Scenes/Main/Scripts/MissionManager.cs | 3 + .../Scenes/Main/Scripts/MissionTabView.cs | 10 + 4 files changed, 178 insertions(+), 82 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index 067defbe..73988c03 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -1,5 +1,81 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &63359378584917910 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5259262016935226082} + - component: {fileID: 324799424550407866} + - component: {fileID: 4499906499707825096} + m_Layer: 5 + m_Name: Country_icon (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5259262016935226082 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 63359378584917910} + 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: [] + m_Father: {fileID: 4157318823827920338} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 90, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &324799424550407866 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 63359378584917910} + m_CullTransparentMesh: 1 +--- !u!114 &4499906499707825096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 63359378584917910} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: de11dad165ea50441a39c14a9ad2c11b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &319647729062617864 GameObject: m_ObjectHideFlags: 0 @@ -93,6 +169,8 @@ MonoBehaviour: onObject: {fileID: 2660639677505249334} offObject: {fileID: 2660639678931990179} indicator: {fileID: 2129846913188432060} + onCityIconTarget: {fileID: 0} + offCityIconTarget: {fileID: 0} --- !u!1 &2660639677099381259 GameObject: m_ObjectHideFlags: 0 @@ -1216,6 +1294,8 @@ MonoBehaviour: onObject: {fileID: 2660639678013920435} offObject: {fileID: 2660639677869302039} indicator: {fileID: 6410983111595538124} + onCityIconTarget: {fileID: 6290293631588047780} + offCityIconTarget: {fileID: 4157318823827920338} --- !u!1 &2660639678206855381 GameObject: m_ObjectHideFlags: 0 @@ -2395,8 +2475,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4157318823827920338} - - component: {fileID: 272665713347772306} - - component: {fileID: 4438385363298217436} m_Layer: 5 m_Name: Country_icon m_TagString: Untagged @@ -2415,7 +2493,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 5259262016935226082} m_Father: {fileID: 7171897423451219938} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2424,44 +2503,6 @@ RectTransform: m_AnchoredPosition: {x: 99, y: -28} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &272665713347772306 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3035743419826554657} - m_CullTransparentMesh: 1 ---- !u!114 &4438385363298217436 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3035743419826554657} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: de11dad165ea50441a39c14a9ad2c11b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &3093995086397900752 GameObject: m_ObjectHideFlags: 0 @@ -2579,6 +2620,82 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 0} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image +--- !u!1 &3119953901401548110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3406760085601607306} + - component: {fileID: 5200104220899655458} + - component: {fileID: 5123924212200207499} + m_Layer: 5 + m_Name: Country_icon (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3406760085601607306 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3119953901401548110} + 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: [] + m_Father: {fileID: 6290293631588047780} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 90, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5200104220899655458 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3119953901401548110} + m_CullTransparentMesh: 1 +--- !u!114 &5123924212200207499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3119953901401548110} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: de11dad165ea50441a39c14a9ad2c11b, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4120952588061536636 GameObject: m_ObjectHideFlags: 0 @@ -2626,8 +2743,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6290293631588047780} - - component: {fileID: 2425090504520250385} - - component: {fileID: 2143674036544900101} m_Layer: 5 m_Name: Country_icon m_TagString: Untagged @@ -2646,7 +2761,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3406760085601607306} m_Father: {fileID: 923781868096368593} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2655,44 +2771,6 @@ RectTransform: m_AnchoredPosition: {x: 99, y: -28} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2425090504520250385 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5502780442579594446} - m_CullTransparentMesh: 1 ---- !u!114 &2143674036544900101 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5502780442579594446} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: de11dad165ea50441a39c14a9ad2c11b, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &5526035085733857660 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionListView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionListView.cs index c4b668a7..c564891f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionListView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionListView.cs @@ -106,4 +106,9 @@ public class MissionListView : MonoBehaviour throw new ArgumentOutOfRangeException(nameof(category), category, null); } } + + public void SetCityIcon(Transform prefab) + { + normalTab.SetCityIcon(prefab); + } } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs index 484ac715..1da78300 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionManager.cs @@ -47,6 +47,9 @@ public class MissionManager : MonoBehaviour onAchieved = LocalCacheManager.Load>(AchievedCallbackTag, null); var gameData = GameDataManager.GameData; + var cityDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.CityDataSheet); + var cityData = cityDataList.First(data => data.id == GameDataManager.GameData.CurrentCityId); + listView.SetCityIcon(cityData.GetIconPrefab()); // デイリーカウントダウン var limitTime = gameData.GetDailyMissionLimitTime(); diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionTabView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionTabView.cs index 6a307316..f24f9881 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionTabView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/MissionTabView.cs @@ -9,6 +9,8 @@ public class MissionTabView : MonoBehaviour [SerializeField] private GameObject onObject; [SerializeField] private GameObject offObject; [SerializeField] private GameObject indicator; + [SerializeField] private Transform onCityIconTarget; + [SerializeField] private Transform offCityIconTarget; public IObservable ClickObservable => button.OnClickAsObservable().TakeUntilDestroy(this); public void SetToggle(bool active) { @@ -20,4 +22,12 @@ public class MissionTabView : MonoBehaviour { indicator.SetActive(active); } + + public void SetCityIcon(Transform prefab) + { + onCityIconTarget.DestroyAllChildrens(); + offCityIconTarget.DestroyAllChildrens(); + Instantiate(prefab, onCityIconTarget); + Instantiate(prefab, offCityIconTarget); + } } \ No newline at end of file