From 2901e91e17f075f1d596a44871249dbf6aa29309 Mon Sep 17 00:00:00 2001 From: jacky_cai Date: Sun, 20 Mar 2022 21:57:19 -0700 Subject: [PATCH] Assign ref. --- Assets/Prefabs/CardClasses/ArcherClass.asset | 18 +++++++ .../CardClasses/ArcherClass.asset.meta | 8 +++ Assets/Prefabs/CardClasses/CavalryClass.asset | 18 +++++++ .../CardClasses/CavalryClass.asset.meta | 8 +++ .../Prefabs/CardClasses/InfantryClass.asset | 17 ++++++ .../CardClasses/InfantryClass.asset.meta | 8 +++ Assets/Prefabs/CardDatas/官军弓兵.asset | 6 ++- Assets/Prefabs/CardDatas/官军步兵.asset | 7 +-- Assets/Prefabs/CardDatas/官军骑兵.asset | 6 ++- Assets/Prefabs/CardDatas/黄巾弓兵.asset | 6 ++- Assets/Prefabs/CardDatas/黄巾步兵.asset | 7 +-- Assets/Prefabs/CardDatas/黄巾骑兵.asset | 6 ++- Assets/Scenes/L1 YellowTurban.unity | 52 +++++++++++++++++++ Assets/Scripts/CardClasses.meta | 8 +++ .../CardClasses/ArcherClass.cs | 0 .../CardClasses/ArcherClass.cs.meta | 0 .../CardClasses/CavalryClass.cs | 0 .../CardClasses/CavalryClass.cs.meta | 0 Assets/Scripts/CardClasses/InfantryClass.cs | 8 +++ .../Scripts/CardClasses/InfantryClass.cs.meta | 11 ++++ 20 files changed, 180 insertions(+), 14 deletions(-) create mode 100644 Assets/Prefabs/CardClasses/ArcherClass.asset create mode 100644 Assets/Prefabs/CardClasses/ArcherClass.asset.meta create mode 100644 Assets/Prefabs/CardClasses/CavalryClass.asset create mode 100644 Assets/Prefabs/CardClasses/CavalryClass.asset.meta create mode 100644 Assets/Prefabs/CardClasses/InfantryClass.asset create mode 100644 Assets/Prefabs/CardClasses/InfantryClass.asset.meta create mode 100644 Assets/Scripts/CardClasses.meta rename Assets/{Prefabs => Scripts}/CardClasses/ArcherClass.cs (100%) rename Assets/{Prefabs => Scripts}/CardClasses/ArcherClass.cs.meta (100%) rename Assets/{Prefabs => Scripts}/CardClasses/CavalryClass.cs (100%) rename Assets/{Prefabs => Scripts}/CardClasses/CavalryClass.cs.meta (100%) create mode 100644 Assets/Scripts/CardClasses/InfantryClass.cs create mode 100644 Assets/Scripts/CardClasses/InfantryClass.cs.meta diff --git a/Assets/Prefabs/CardClasses/ArcherClass.asset b/Assets/Prefabs/CardClasses/ArcherClass.asset new file mode 100644 index 0000000..84b3236 --- /dev/null +++ b/Assets/Prefabs/CardClasses/ArcherClass.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1bc96940f74c4ce4581f5cdec90d1e0b, type: 3} + m_Name: ArcherClass + m_EditorClassIdentifier: + name: + description: + artwork: {fileID: 0} + extraAttackRange: 2 diff --git a/Assets/Prefabs/CardClasses/ArcherClass.asset.meta b/Assets/Prefabs/CardClasses/ArcherClass.asset.meta new file mode 100644 index 0000000..b5260fd --- /dev/null +++ b/Assets/Prefabs/CardClasses/ArcherClass.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9c0ba6b77d1ad844d957f6d66b24dd1f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/CardClasses/CavalryClass.asset b/Assets/Prefabs/CardClasses/CavalryClass.asset new file mode 100644 index 0000000..7daa878 --- /dev/null +++ b/Assets/Prefabs/CardClasses/CavalryClass.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e099c37da90ac1b46ac0a5ee6f79f507, type: 3} + m_Name: CavalryClass + m_EditorClassIdentifier: + name: + description: + artwork: {fileID: 0} + extraMovement: 1 diff --git a/Assets/Prefabs/CardClasses/CavalryClass.asset.meta b/Assets/Prefabs/CardClasses/CavalryClass.asset.meta new file mode 100644 index 0000000..15adb0f --- /dev/null +++ b/Assets/Prefabs/CardClasses/CavalryClass.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c8cf65dbf365874ca1c1dee59e831c2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/CardClasses/InfantryClass.asset b/Assets/Prefabs/CardClasses/InfantryClass.asset new file mode 100644 index 0000000..ab02725 --- /dev/null +++ b/Assets/Prefabs/CardClasses/InfantryClass.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52ce9ab65798e6c46a62ac364d881763, type: 3} + m_Name: InfantryClass + m_EditorClassIdentifier: + name: + description: + artwork: {fileID: 0} diff --git a/Assets/Prefabs/CardClasses/InfantryClass.asset.meta b/Assets/Prefabs/CardClasses/InfantryClass.asset.meta new file mode 100644 index 0000000..09837c5 --- /dev/null +++ b/Assets/Prefabs/CardClasses/InfantryClass.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 548b88e44eb600c4fa3a63033e23be30 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/CardDatas/官军弓兵.asset b/Assets/Prefabs/CardDatas/官军弓兵.asset index 123f412..6d12a63 100644 --- a/Assets/Prefabs/CardDatas/官军弓兵.asset +++ b/Assets/Prefabs/CardDatas/官军弓兵.asset @@ -18,5 +18,7 @@ MonoBehaviour: cost: 1 attack: 5 defense: 10 - cardTags: - - {fileID: 11400000, guid: 099176a69eb9a6d408b4d4dba5232c84, type: 2} + tags: [] + unitClasses: + - {fileID: 11400000, guid: 9c0ba6b77d1ad844d957f6d66b24dd1f, type: 2} + abilities: [] diff --git a/Assets/Prefabs/CardDatas/官军步兵.asset b/Assets/Prefabs/CardDatas/官军步兵.asset index 9dca94a..973ad9c 100644 --- a/Assets/Prefabs/CardDatas/官军步兵.asset +++ b/Assets/Prefabs/CardDatas/官军步兵.asset @@ -18,6 +18,7 @@ MonoBehaviour: cost: 1 attack: 5 defense: 20 - movement: 1 - cardTags: - - {fileID: 11400000, guid: cf728e5d8a62fa3418d2f3daa01f93df, type: 2} + tags: [] + unitClasses: + - {fileID: 11400000, guid: 548b88e44eb600c4fa3a63033e23be30, type: 2} + abilities: [] diff --git a/Assets/Prefabs/CardDatas/官军骑兵.asset b/Assets/Prefabs/CardDatas/官军骑兵.asset index 43c3790..c367c64 100644 --- a/Assets/Prefabs/CardDatas/官军骑兵.asset +++ b/Assets/Prefabs/CardDatas/官军骑兵.asset @@ -18,5 +18,7 @@ MonoBehaviour: cost: 1 attack: 10 defense: 10 - cardTags: - - {fileID: 11400000, guid: 53185ea05ebfbd843b009cb14101377a, type: 2} + tags: [] + unitClasses: + - {fileID: 11400000, guid: 2c8cf65dbf365874ca1c1dee59e831c2, type: 2} + abilities: [] diff --git a/Assets/Prefabs/CardDatas/黄巾弓兵.asset b/Assets/Prefabs/CardDatas/黄巾弓兵.asset index bb13c1e..dc7f3a0 100644 --- a/Assets/Prefabs/CardDatas/黄巾弓兵.asset +++ b/Assets/Prefabs/CardDatas/黄巾弓兵.asset @@ -18,5 +18,7 @@ MonoBehaviour: cost: 1 attack: 5 defense: 10 - cardTags: - - {fileID: 11400000, guid: 099176a69eb9a6d408b4d4dba5232c84, type: 2} + tags: [] + unitClasses: + - {fileID: 11400000, guid: 9c0ba6b77d1ad844d957f6d66b24dd1f, type: 2} + abilities: [] diff --git a/Assets/Prefabs/CardDatas/黄巾步兵.asset b/Assets/Prefabs/CardDatas/黄巾步兵.asset index cfd1a21..e74aa12 100644 --- a/Assets/Prefabs/CardDatas/黄巾步兵.asset +++ b/Assets/Prefabs/CardDatas/黄巾步兵.asset @@ -18,6 +18,7 @@ MonoBehaviour: cost: 1 attack: 3 defense: 18 - movement: 1 - cardTags: - - {fileID: 11400000, guid: cf728e5d8a62fa3418d2f3daa01f93df, type: 2} + tags: [] + unitClasses: + - {fileID: 11400000, guid: 548b88e44eb600c4fa3a63033e23be30, type: 2} + abilities: [] diff --git a/Assets/Prefabs/CardDatas/黄巾骑兵.asset b/Assets/Prefabs/CardDatas/黄巾骑兵.asset index 2c9da74..d6ae7aa 100644 --- a/Assets/Prefabs/CardDatas/黄巾骑兵.asset +++ b/Assets/Prefabs/CardDatas/黄巾骑兵.asset @@ -18,5 +18,7 @@ MonoBehaviour: cost: 1 attack: 7 defense: 8 - cardTags: - - {fileID: 11400000, guid: 53185ea05ebfbd843b009cb14101377a, type: 2} + tags: [] + unitClasses: + - {fileID: 11400000, guid: 2c8cf65dbf365874ca1c1dee59e831c2, type: 2} + abilities: [] diff --git a/Assets/Scenes/L1 YellowTurban.unity b/Assets/Scenes/L1 YellowTurban.unity index f49ac36..649f302 100644 --- a/Assets/Scenes/L1 YellowTurban.unity +++ b/Assets/Scenes/L1 YellowTurban.unity @@ -321,6 +321,10 @@ PrefabInstance: propertyPath: side value: -1 objectReference: {fileID: 0} + - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} + propertyPath: baseData + value: + objectReference: {fileID: 11400000, guid: 675490af7d7c9c142ae76d1b2e4920b1, type: 2} - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} propertyPath: cardData value: @@ -688,6 +692,10 @@ PrefabInstance: propertyPath: side value: -1 objectReference: {fileID: 0} + - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} + propertyPath: baseData + value: + objectReference: {fileID: 11400000, guid: 675490af7d7c9c142ae76d1b2e4920b1, type: 2} - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} propertyPath: cardData value: @@ -823,6 +831,10 @@ PrefabInstance: propertyPath: side value: -1 objectReference: {fileID: 0} + - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} + propertyPath: baseData + value: + objectReference: {fileID: 11400000, guid: 675490af7d7c9c142ae76d1b2e4920b1, type: 2} - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} propertyPath: cardData value: @@ -1279,6 +1291,10 @@ PrefabInstance: propertyPath: m_Name value: "\u5C0F\u5175 (4)" objectReference: {fileID: 0} + - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} + propertyPath: baseData + value: + objectReference: {fileID: 11400000, guid: 5d7c6bbedeba24e4f98ea1ca65fc5c0a, type: 2} - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} propertyPath: standingCell value: @@ -1823,6 +1839,10 @@ PrefabInstance: propertyPath: m_Name value: "\u5C0F\u5175 (3)" objectReference: {fileID: 0} + - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} + propertyPath: baseData + value: + objectReference: {fileID: 11400000, guid: 9eb62481994b51e4897a57499081c3db, type: 2} - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} propertyPath: cardData value: @@ -2164,6 +2184,10 @@ PrefabInstance: propertyPath: side value: -1 objectReference: {fileID: 0} + - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} + propertyPath: baseData + value: + objectReference: {fileID: 11400000, guid: 9eb62481994b51e4897a57499081c3db, type: 2} - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} propertyPath: cardData value: @@ -2249,6 +2273,10 @@ PrefabInstance: propertyPath: side value: -1 objectReference: {fileID: 0} + - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} + propertyPath: baseData + value: + objectReference: {fileID: 11400000, guid: 675490af7d7c9c142ae76d1b2e4920b1, type: 2} - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} propertyPath: cardData value: @@ -2645,6 +2673,10 @@ PrefabInstance: propertyPath: m_Name value: "\u5C0F\u5175 (2)" objectReference: {fileID: 0} + - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} + propertyPath: baseData + value: + objectReference: {fileID: 11400000, guid: adc3952bb833a224895877477b4ce92e, type: 2} - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} propertyPath: cardData value: @@ -3102,6 +3134,10 @@ PrefabInstance: propertyPath: side value: -1 objectReference: {fileID: 0} + - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} + propertyPath: baseData + value: + objectReference: {fileID: 11400000, guid: 9eb62481994b51e4897a57499081c3db, type: 2} - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} propertyPath: cardData value: @@ -3297,6 +3333,10 @@ PrefabInstance: propertyPath: m_Name value: "\u5C0F\u5175 (5)" objectReference: {fileID: 0} + - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} + propertyPath: baseData + value: + objectReference: {fileID: 11400000, guid: 9eb62481994b51e4897a57499081c3db, type: 2} - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} propertyPath: cardData value: @@ -3521,6 +3561,10 @@ PrefabInstance: propertyPath: side value: -1 objectReference: {fileID: 0} + - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} + propertyPath: baseData + value: + objectReference: {fileID: 11400000, guid: 9eb62481994b51e4897a57499081c3db, type: 2} - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} propertyPath: cardData value: @@ -3741,6 +3785,10 @@ PrefabInstance: propertyPath: m_Name value: "\u5C0F\u5175 (1)" objectReference: {fileID: 0} + - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} + propertyPath: baseData + value: + objectReference: {fileID: 11400000, guid: adc3952bb833a224895877477b4ce92e, type: 2} - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} propertyPath: standingCell value: @@ -3811,6 +3859,10 @@ PrefabInstance: propertyPath: m_Name value: "\u5C0F\u5175" objectReference: {fileID: 0} + - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} + propertyPath: baseData + value: + objectReference: {fileID: 11400000, guid: 5d7c6bbedeba24e4f98ea1ca65fc5c0a, type: 2} - target: {fileID: 2394601694276102747, guid: 81eab03836e5b52448e4ad61de8f2406, type: 3} propertyPath: standingCell value: diff --git a/Assets/Scripts/CardClasses.meta b/Assets/Scripts/CardClasses.meta new file mode 100644 index 0000000..cf110d9 --- /dev/null +++ b/Assets/Scripts/CardClasses.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bebb282b5d98d3649bcb4e43de3f2de3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/CardClasses/ArcherClass.cs b/Assets/Scripts/CardClasses/ArcherClass.cs similarity index 100% rename from Assets/Prefabs/CardClasses/ArcherClass.cs rename to Assets/Scripts/CardClasses/ArcherClass.cs diff --git a/Assets/Prefabs/CardClasses/ArcherClass.cs.meta b/Assets/Scripts/CardClasses/ArcherClass.cs.meta similarity index 100% rename from Assets/Prefabs/CardClasses/ArcherClass.cs.meta rename to Assets/Scripts/CardClasses/ArcherClass.cs.meta diff --git a/Assets/Prefabs/CardClasses/CavalryClass.cs b/Assets/Scripts/CardClasses/CavalryClass.cs similarity index 100% rename from Assets/Prefabs/CardClasses/CavalryClass.cs rename to Assets/Scripts/CardClasses/CavalryClass.cs diff --git a/Assets/Prefabs/CardClasses/CavalryClass.cs.meta b/Assets/Scripts/CardClasses/CavalryClass.cs.meta similarity index 100% rename from Assets/Prefabs/CardClasses/CavalryClass.cs.meta rename to Assets/Scripts/CardClasses/CavalryClass.cs.meta diff --git a/Assets/Scripts/CardClasses/InfantryClass.cs b/Assets/Scripts/CardClasses/InfantryClass.cs new file mode 100644 index 0000000..92fd5e5 --- /dev/null +++ b/Assets/Scripts/CardClasses/InfantryClass.cs @@ -0,0 +1,8 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(fileName = "InfantryClass", menuName = "Card Class/Infantry Class Data")] +public class InfantryClass : UnitClass +{ +} diff --git a/Assets/Scripts/CardClasses/InfantryClass.cs.meta b/Assets/Scripts/CardClasses/InfantryClass.cs.meta new file mode 100644 index 0000000..c91adc4 --- /dev/null +++ b/Assets/Scripts/CardClasses/InfantryClass.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 52ce9ab65798e6c46a62ac364d881763 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: