From 16499660175c4d2b27408a35abe6c944ccd7c6cb Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 27 Mar 2021 16:05:23 +0900 Subject: [PATCH] [fix]conflict --- Assets/Scenes/CardList.unity | 359 +++++++++++++++++++++++++++++++++- Assets/Scripts/ListManager.cs | 174 +++++++++++++--- 2 files changed, 502 insertions(+), 31 deletions(-) diff --git a/Assets/Scenes/CardList.unity b/Assets/Scenes/CardList.unity index 09a54d1..ac69287 100644 --- a/Assets/Scenes/CardList.unity +++ b/Assets/Scenes/CardList.unity @@ -125,7 +125,7 @@ GameObject: - component: {fileID: 18516408} - component: {fileID: 18516407} m_Layer: 5 - m_Name: ListPanel (1) + m_Name: 'ListPanel ' m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -208,6 +208,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 18516405} m_CullTransparentMesh: 0 +--- !u!1 &134178333 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 134178334} + - component: {fileID: 134178336} + - component: {fileID: 134178335} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &134178334 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 134178333} + 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_Children: [] + m_Father: {fileID: 367249491} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &134178335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 134178333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u2190" +--- !u!222 &134178336 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 134178333} + m_CullTransparentMesh: 0 --- !u!1 &215959251 GameObject: m_ObjectHideFlags: 0 @@ -359,7 +436,7 @@ GameObject: - component: {fileID: 239131936} - component: {fileID: 239131935} m_Layer: 5 - m_Name: NextCardListButton + m_Name: NextButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -424,7 +501,18 @@ MonoBehaviour: m_TargetGraphic: {fileID: 239131936} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 955891125} + m_MethodName: pageNext + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &239131936 MonoBehaviour: m_ObjectHideFlags: 0 @@ -471,6 +559,7 @@ GameObject: - component: {fileID: 269650077} - component: {fileID: 269650079} - component: {fileID: 269650078} + - component: {fileID: 269650080} m_Layer: 5 m_Name: CardListBackground m_TagString: Untagged @@ -532,6 +621,57 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 269650076} m_CullTransparentMesh: 0 +--- !u!114 &269650080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 269650076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 269650078} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 955891125} + m_MethodName: clickBackground + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &309570887 GameObject: m_ObjectHideFlags: 0 @@ -657,6 +797,131 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 309570887} m_CullTransparentMesh: 0 +--- !u!1 &367249490 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 367249491} + - component: {fileID: 367249494} + - component: {fileID: 367249493} + - component: {fileID: 367249492} + m_Layer: 5 + m_Name: BackButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &367249491 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367249490} + 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_Children: + - {fileID: 134178334} + m_Father: {fileID: 1770091966} + m_RootOrder: 10 + 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: -374.08002, y: -230.85} + m_SizeDelta: {x: 174.56, y: 56.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &367249492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367249490} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 367249493} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 955891125} + m_MethodName: pageBefore + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &367249493 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367249490} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &367249494 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367249490} + m_CullTransparentMesh: 0 --- !u!1 &403196033 GameObject: m_ObjectHideFlags: 0 @@ -984,6 +1249,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 639120034} m_CullTransparentMesh: 0 +--- !u!1 &666653540 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 666653541} + - component: {fileID: 666653543} + - component: {fileID: 666653542} + m_Layer: 5 + m_Name: PageNumberText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &666653541 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 666653540} + 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_Children: [] + m_Father: {fileID: 1770091966} + m_RootOrder: 11 + 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: -236.3} + m_SizeDelta: {x: 80, y: 67.4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &666653542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 666653540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: -1- +--- !u!222 &666653543 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 666653540} + m_CullTransparentMesh: 0 --- !u!1 &686803181 GameObject: m_ObjectHideFlags: 0 @@ -1405,7 +1747,7 @@ RectTransform: - {fileID: 978035577} - {fileID: 908135369} m_Father: {fileID: 1770091966} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1574,6 +1916,9 @@ MonoBehaviour: abilityText: {fileID: 2067900256} listPanel: {fileID: 18516406} detailPanel: {fileID: 855972605} + pageText: {fileID: 666653542} + nextPageButton: {fileID: 239131936} + prePageButton: {fileID: 367249493} inputField: {fileID: 816584295} inputText: {fileID: 846949420} --- !u!1 &978035576 @@ -2274,8 +2619,8 @@ RectTransform: 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: 153, y: 89.30002} - m_SizeDelta: {x: 104.4, y: 49.4} + m_AnchoredPosition: {x: 152.99994, y: 89.29996} + m_SizeDelta: {x: 126.8, y: 49.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1585719168 MonoBehaviour: @@ -2496,6 +2841,8 @@ RectTransform: - {fileID: 309570888} - {fileID: 461824474} - {fileID: 239131934} + - {fileID: 367249491} + - {fileID: 666653541} - {fileID: 855972606} m_Father: {fileID: 0} m_RootOrder: 1 diff --git a/Assets/Scripts/ListManager.cs b/Assets/Scripts/ListManager.cs index c726d13..483c2a1 100644 --- a/Assets/Scripts/ListManager.cs +++ b/Assets/Scripts/ListManager.cs @@ -16,6 +16,9 @@ public class ListManager : MonoBehaviour{ [SerializeField] private Text abilityText; [SerializeField] Transform listPanel; [SerializeField] GameObject detailPanel; + [SerializeField] private Text pageText; + [SerializeField] private Image nextPageButton; + [SerializeField] private Image prePageButton; CardModel cardModel; @@ -23,10 +26,15 @@ public class ListManager : MonoBehaviour{ [SerializeField] private Text inputText; private bool isDetail = false; - private List CList = new List() { 1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 ,15};//中身を絶対に変更しない + private bool isSearch = false;//検索している状態かどうか + + private List CList = new List() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 };//中身を絶対に変更しない private List referenceCard = new List();//idとかを参照する用 private List saveCard = new List();//ゲームに表示する用 + private int pageNumber = 1;//ページ番号 + private const int MaxpageNumber = 14;//ページにい表示できるmaxの数 + void Start() { inputField = inputField.GetComponent(); @@ -34,11 +42,29 @@ void Start() { CardList(CList); - for (int i = 0; i < CList.Count; i++) { + for (int i = 0; i < saveCard.Count; i++) { saveCard[i].GetComponent().enabled = false; } } + private void Update() { + + pageText.text = "-" + pageNumber + "-";//pageNumberの更新 + + if (pageNumber >= CList.Count / MaxpageNumber + 1 || isSearch) {//NextButtomの色の変化を監視 + nextPageButton.color = new Color(0.5f, 0.5f, 0.5f); + } else { + nextPageButton.color = new Color(1.0f, 1.0f, 1.0f); + } + + if (pageNumber == 1) {//PreButtomの色の変化を監視 + prePageButton.color = new Color(0.5f, 0.5f, 0.5f); + } else { + prePageButton.color = new Color(1.0f, 1.0f, 1.0f); + } + + } + public void InputText() {//文字が更新(入力・削除)されるたびに呼び出される inputText.text = inputField.text; @@ -55,12 +81,13 @@ public void EnterInputText() { if (inputText.text == referenceCard[i].name) { if (!searchList.Contains(referenceCard[i].id)) { - Debug.Log("dainyu"); searchList.Add(referenceCard[i].id); } } } - + + pageNumber = searchList.Count / MaxpageNumber + 1; + /* * 動きがよくわかってなくて怪しい。でも動く */ @@ -73,9 +100,7 @@ public void EnterInputText() { if (inputText.text != "") {//検索に引っ掛かったカードのidをもとに生成 - Debug.Log("空白じゃないよ"); - - for (int i = 0; i < searchList.Count; i++) { + for (int i = (pageNumber - 1) * MaxpageNumber; i < pageNumber * MaxpageNumber && i < searchList.Count; i++) { cardDisplayPrefab.Initialize(searchList[i]); @@ -88,14 +113,13 @@ public void EnterInputText() { saveCard.Add(card); } - for (int i = 0; i < searchList.Count; i++) { + for (int i = 0; i < saveCard.Count; i++) { saveCard[i].GetComponent().enabled = false; } - } else {//検索欄に入力がなくなったら元に戻す - - Debug.Log("空白daよ"); + } + /*else {//検索欄に入力がなくなったら元に戻す for (int i = 0; i < CList.Count; i++) {//検索に引っ掛かったカードのidをもとに生成 cardDisplayPrefab.Initialize(CList[i]); @@ -113,16 +137,18 @@ public void EnterInputText() { saveCard[i].GetComponent().enabled = false; } - } + }*/ inputField.text = ""; inputText.text = ""; + isSearch = true; + } public void CardList(List cardId) { - for (int i = 0; i < cardId.Count; i++) {//表示用のカードの生成 + for (int i = (pageNumber - 1) * MaxpageNumber; i < pageNumber * MaxpageNumber && i < CList.Count; i++) {//表示用のカードの生成 cardDisplayPrefab.Initialize(cardId[i]); @@ -165,9 +191,9 @@ public void IsDetailPanel(int id) {//画像とテキストの読み込み cardModel = new CardModel(id);//test abilityText.text = "カード効果:\n\n " + cardModel.ability; - attackText.text = "攻撃力：" + cardModel.at.ToString(); - hitPointText.text = "体力：" + cardModel.hp.ToString(); - costText.text = "コスト：" + cardModel.cost.ToString(); + attackText.text = "攻撃力:" + cardModel.at.ToString(); + hitPointText.text = "体力:" + cardModel.hp.ToString(); + costText.text = "コスト:" + cardModel.cost.ToString(); nameText.text = cardModel.name; iconImage.sprite = cardModel.icon; @@ -194,8 +220,9 @@ public void offDetailPanel() { public void sortId() {//配列の中のidを並べ替える - if (CList.Count == saveCard.Count) {//応急処置 + if (!isSearch) {//検索の有無でソートをしている。 + pageNumber = 1; referenceCard.Sort((a, b) => a.id - b.id);//Listのソート @@ -204,7 +231,7 @@ public void sortId() {//配列の中のidを並べ替える } saveCard.Clear();//危険なdestroy clear - for (int i = 0; i < CList.Count; i++) {//inListが動的に生成されるのでCountが使えない。idがかぶることはないのでClistと同じ数だしええやろ + for (int i = (pageNumber - 1) * MaxpageNumber; i < pageNumber * MaxpageNumber && i < CList.Count; i++) {//inListが動的に生成されるのでCountが使えない。idがかぶることはないのでClistと同じ数だしええやろ cardDisplayPrefab.Initialize(referenceCard[i].id); @@ -218,7 +245,7 @@ public void sortId() {//配列の中のidを並べ替える } - for (int i = 0; i < CList.Count; i++) { + for (int i = 0; i < saveCard.Count; i++) { saveCard[i].GetComponent().enabled = false; } @@ -227,7 +254,9 @@ public void sortId() {//配列の中のidを並べ替える public void sortHP() {//配列の中のhpを並べ替える - if (CList.Count == saveCard.Count) {//応急処置 + if (!isSearch) { + + pageNumber = 1; referenceCard.Sort((a, b) => a.hp - b.hp);//Listのソート @@ -236,7 +265,7 @@ public void sortHP() {//配列の中のhpを並べ替える } saveCard.Clear();//危険なdestroy clear - for (int i = 0; i < CList.Count; i++) {//inListが動的に生成されるのでCountが使えない。idがかぶることはないのでClistと同じ数だしええやろ + for (int i = (pageNumber - 1) * MaxpageNumber; i < pageNumber * MaxpageNumber && i < CList.Count; i++) {//inListが動的に生成されるのでCountが使えない。idがかぶることはないのでClistと同じ数だしええやろ cardDisplayPrefab.Initialize(referenceCard[i].id); @@ -250,7 +279,7 @@ public void sortHP() {//配列の中のhpを並べ替える } - for (int i = 0; i < CList.Count; i++) { + for (int i = 0; i < saveCard.Count; i++) { saveCard[i].GetComponent().enabled = false; } @@ -260,7 +289,9 @@ public void sortHP() {//配列の中のhpを並べ替える public void sortAttack() {//配列の中のatを並べ替える - if (CList.Count == saveCard.Count) {//応急処置 + if (!isSearch) { + + pageNumber = 1; referenceCard.Sort((a, b) => a.at - b.at);//Listのソート @@ -269,7 +300,7 @@ public void sortAttack() {//配列の中のatを並べ替える } saveCard.Clear();//危険なdestroy clear - for (int i = 0; i < CList.Count; i++) {//inListが動的に生成されるのでCountが使えない。idがかぶることはないのでClistと同じ数だしええやろ + for (int i = (pageNumber - 1) * MaxpageNumber; i < pageNumber * MaxpageNumber && i < CList.Count; i++) {//inListが動的に生成されるのでCountが使えない。idがかぶることはないのでClistと同じ数だしええやろ cardDisplayPrefab.Initialize(referenceCard[i].id); @@ -283,11 +314,104 @@ public void sortAttack() {//配列の中のatを並べ替える } - for (int i = 0; i < CList.Count; i++) { + for (int i = 0; i < saveCard.Count; i++) { saveCard[i].GetComponent().enabled = false; } } } + public void pageNext() {//検索を2ページ以降考えるなら、変更が必要 + + if ((pageNumber < CList.Count / MaxpageNumber + 1) && !isSearch) { + pageNumber++; + + + for (int i = 0; i < saveCard.Count; i++) {//現在表示されているカードの削除 + Destroy(saveCard[i]); + } + saveCard.Clear();//危険なdestroy clear + + for (int i = (pageNumber - 1) * MaxpageNumber; i < pageNumber * MaxpageNumber && i < CList.Count; i++) {//inListが動的に生成されるのでCountが使えない。idがかぶることはないのでClistと同じ数だしええやろ + + cardDisplayPrefab.Initialize(referenceCard[i].id); + + GameObject card = Instantiate(cardPrefab, listPanel, false); + + card.transform.localScale = new Vector3(1, 2, 0); + + AddEventTrigger(card, referenceCard[i].id); + + saveCard.Add(card); + + } + + for (int i = 0; i < saveCard.Count; i++) { + saveCard[i].GetComponent().enabled = false; + } + + } + } + + public void pageBefore() { + + if (pageNumber > 1 && !isSearch) { + pageNumber--; + + + for (int i = 0; i < saveCard.Count; i++) {//現在表示されているカードの削除 + Destroy(saveCard[i]); + } + saveCard.Clear();//危険なdestroy clear + + for (int i = (pageNumber - 1) * MaxpageNumber; i < pageNumber * MaxpageNumber && i < CList.Count; i++) {//inListが動的に生成されるのでCountが使えない。idがかぶることはないのでClistと同じ数だしええやろ + + cardDisplayPrefab.Initialize(referenceCard[i].id); + + GameObject card = Instantiate(cardPrefab, listPanel, false); + + card.transform.localScale = new Vector3(1, 2, 0); + + AddEventTrigger(card, referenceCard[i].id); + + saveCard.Add(card); + + } + + for (int i = 0; i < saveCard.Count; i++) { + saveCard[i].GetComponent().enabled = false; + } + + } + + } + + public void clickBackground() { + isSearch = false; + + referenceCard.Sort((a, b) => a.id - b.id); + + for (int i = 0; i < saveCard.Count; i++) {//現在表示されているカードの削除 + Destroy(saveCard[i]); + } + saveCard.Clear();//危険なdestroy clear + + for (int i = (pageNumber - 1) * MaxpageNumber; i < pageNumber * MaxpageNumber && i < CList.Count; i++) {//検索に引っ掛かったカードのidをもとに生成 + cardDisplayPrefab.Initialize(referenceCard[i].id); + + GameObject card = Instantiate(cardPrefab, listPanel, false); + + card.transform.localScale = new Vector3(1, 2, 0); + + AddEventTrigger(card, referenceCard[i].id); + + saveCard.Add(card); + } + + for (int i = 0; i < saveCard.Count; i++) { + saveCard[i].GetComponent().enabled = false; + } + + } + }