From 3e3a93338556c7a292e95e0d6c459f3817c617ea Mon Sep 17 00:00:00 2001 From: SherlockShiYL Date: Thu, 17 Mar 2022 15:20:04 -0700 Subject: [PATCH] Upload Scence. --- Assets/Prefabs/CardDatas/ZhaoYun.asset | 3 +-- Assets/Scenes/HandSimulator.unity | 20 -------------------- Assets/Scripts/Deck.cs | 1 - 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/Assets/Prefabs/CardDatas/ZhaoYun.asset b/Assets/Prefabs/CardDatas/ZhaoYun.asset index af1cc3a..17c0d70 100644 --- a/Assets/Prefabs/CardDatas/ZhaoYun.asset +++ b/Assets/Prefabs/CardDatas/ZhaoYun.asset @@ -14,11 +14,10 @@ MonoBehaviour: m_EditorClassIdentifier: name: ZhaoYun description: - artwork: {fileID: 0} + artwork: {fileID: 21300000, guid: 0c5ad4d47b284844ca0fce58c9b22564, type: 3} cost: 0 attack: 0 defense: 0 - movement: 1 cardTags: - {fileID: 11400000, guid: cf728e5d8a62fa3418d2f3daa01f93df, type: 2} - {fileID: 11400000, guid: 53185ea05ebfbd843b009cb14101377a, type: 2} diff --git a/Assets/Scenes/HandSimulator.unity b/Assets/Scenes/HandSimulator.unity index 8dcb264..237a314 100644 --- a/Assets/Scenes/HandSimulator.unity +++ b/Assets/Scenes/HandSimulator.unity @@ -475,25 +475,5 @@ PrefabInstance: propertyPath: m_Name value: UIDeck objectReference: {fileID: 0} - - target: {fileID: 5083260762951157943, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5277353724762008331, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5277353724762008331, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5277353724762008331, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3} - propertyPath: m_AnchoredPosition.x - value: 425 - objectReference: {fileID: 0} - - target: {fileID: 5277353724762008331, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3} - propertyPath: m_AnchoredPosition.y - value: -75 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0890cb6eff04b7c46be2a388688fe4d6, type: 3} diff --git a/Assets/Scripts/Deck.cs b/Assets/Scripts/Deck.cs index 4eb91d1..5a29ee1 100644 --- a/Assets/Scripts/Deck.cs +++ b/Assets/Scripts/Deck.cs @@ -125,7 +125,6 @@ public class Deck : MonoBehaviour tempCardDisplay.transform.Find("Button").gameObject.GetComponent().sprite = discardList[index].artwork; tempCardDisplay.SetActive(true); drawDisplayList.Add(tempCardDisplay); - discardList[index] = discardList[discardList.Count - 1]; discardList.RemoveAt(discardList.Count - 1); };