WGL 1 сар өмнө
parent
commit
ec7b62949c

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 341 - 266
ActionTowerDefense/Assets/Resources/Prefab/RougueUI/Shop_UI.prefab


+ 172 - 0
ActionTowerDefense/Assets/Resources/Prefab/RougueUI/Treasure.prefab

@@ -0,0 +1,172 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4719440907654758025
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6382038225628232722}
+  - component: {fileID: 7260376816604576304}
+  - component: {fileID: 220482037564887049}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6382038225628232722
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4719440907654758025}
+  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: 4429194585466798864}
+  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: 75, y: 75}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7260376816604576304
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4719440907654758025}
+  m_CullTransparentMesh: 1
+--- !u!114 &220482037564887049
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4719440907654758025}
+  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: 0}
+  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 &7033689791601379101
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4429194585466798864}
+  - component: {fileID: 82841992257256868}
+  - component: {fileID: 6256315506709047983}
+  - component: {fileID: 5775290248772634857}
+  m_Layer: 5
+  m_Name: Treasure
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4429194585466798864
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7033689791601379101}
+  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:
+  - {fileID: 6382038225628232722}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &82841992257256868
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7033689791601379101}
+  m_CullTransparentMesh: 1
+--- !u!114 &6256315506709047983
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7033689791601379101}
+  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: 0.47843137, g: 0.47843137, b: 0.47843137, 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: 0}
+  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!114 &5775290248772634857
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7033689791601379101}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 104468bd0e5fd2d4e97759632a133d3d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  image: {fileID: 220482037564887049}
+  background: {fileID: 6256315506709047983}
+  sprite: {fileID: 0}
+  color: {r: 0, g: 0, b: 0, a: 0}

+ 7 - 0
ActionTowerDefense/Assets/Resources/Prefab/RougueUI/Treasure.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d000b5eb608024948b98cb191d9e4de8
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 30 - 2
ActionTowerDefense/Assets/Scripts/UI/ShopUI.cs

@@ -12,6 +12,8 @@ public class ShopUI : MonoBehaviour
     [FoldoutGroup("×é¼þ")] public Sprite[] tagsUI;
     [FoldoutGroup("×é¼þ")] public Sprite[] tagsUI;
     [FoldoutGroup("×é¼þ")] public TextMeshProUGUI refreshPriceText;
     [FoldoutGroup("×é¼þ")] public TextMeshProUGUI refreshPriceText;
     [FoldoutGroup("×é¼þ")] public RadarChart radarChart;
     [FoldoutGroup("×é¼þ")] public RadarChart radarChart;
+    [FoldoutGroup("×é¼þ")] public GameObject treasureInBag;
+    [FoldoutGroup("×é¼þ")] public Transform bagContent;
     public Color[] qualitysIcon;
     public Color[] qualitysIcon;
     public Color[] qualitysText;
     public Color[] qualitysText;
     
     
@@ -76,7 +78,8 @@ public class ShopUI : MonoBehaviour
             treasuresSaleUI[i].Init();
             treasuresSaleUI[i].Init();
             randomTreasure.Add(singleTreasureConfig.ID);
             randomTreasure.Add(singleTreasureConfig.ID);
         }
         }
-        RefreshUIPolygon();
+        DrawUIPolygon();
+        DrawBag();
         gameObject.SetActive(true);
         gameObject.SetActive(true);
     }
     }
 
 
@@ -91,7 +94,7 @@ public class ShopUI : MonoBehaviour
         Init();
         Init();
     }
     }
 
 
-    public void RefreshUIPolygon()
+    public void DrawUIPolygon()
     {
     {
         List<int> tagsId = GameManager.instance.myTreasuresTag;
         List<int> tagsId = GameManager.instance.myTreasuresTag;
         int maxId = tagsId[0];
         int maxId = tagsId[0];
@@ -112,4 +115,29 @@ public class ShopUI : MonoBehaviour
         }
         }
         radarChart.SetRatioList(polygon);
         radarChart.SetRatioList(polygon);
     }
     }
+
+    public void DrawBag()
+    {
+        List<Treasure> treasures = GameManager.instance.myTreasures;
+        for(int i = 0; i < treasures.Count; i++)
+        {
+            TreasureInBag treasureInBag;
+            if (i >= bagContent.childCount)
+            {
+                GameObject obj = Instantiate(this.treasureInBag,bagContent);
+                treasureInBag = obj.GetComponent<TreasureInBag>();
+            }
+            else
+            {
+                treasureInBag = bagContent.GetChild(i).GetComponent<TreasureInBag>();
+            }
+            treasureInBag.sprite = treasures[i].sprite;
+            treasureInBag.color = treasures[i].qualityIcon;
+            treasureInBag.Refresh();
+        }
+        for(int i = treasures.Count; i < bagContent.childCount; i++)
+        {
+            Destroy(bagContent.GetChild(i));
+        }
+    }
 }
 }

+ 18 - 0
ActionTowerDefense/Assets/Scripts/UI/TreasureInBag.cs

@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class TreasureInBag : MonoBehaviour
+{
+    public Image image;
+    public Image background;
+    [DisplayOnly] public Sprite sprite;
+    [DisplayOnly] public Color color;
+
+    public void Refresh()
+    {
+        image.sprite = sprite;
+        background.color = color;
+    }
+}

+ 11 - 0
ActionTowerDefense/Assets/Scripts/UI/TreasureInBag.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 104468bd0e5fd2d4e97759632a133d3d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 1
ActionTowerDefense/Assets/Scripts/UI/TreasuresSaleUI.cs

@@ -117,7 +117,8 @@ public class TreasuresSaleUI : MonoBehaviour
         {
         {
             GameManager.instance.myTreasuresTag[treasure.tagsId[i] - 1]++;
             GameManager.instance.myTreasuresTag[treasure.tagsId[i] - 1]++;
         }
         }
-        shopUI.RefreshUIPolygon();
+        shopUI.DrawUIPolygon();
+        shopUI.DrawBag();
         gameObject.SetActive(false);
         gameObject.SetActive(false);
         isNull = true;
         isNull = true;
         islock = false;
         islock = false;

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно