Przeglądaj źródła

Training added, fixed assembly script

mbunch_kascope 1 rok temu
rodzic
commit
7c66471910

+ 2 - 2
Assets/CardEffect/EX9/Yellow/EX9_022.cs

@@ -24,9 +24,9 @@ namespace DCGO.CardEffects.EX9
 
             #region Training
 
-            if (timing == EffectTiming.OnStartMainPhase)
+            if (timing == EffectTiming.OnDeclaration)
             {
-                // To be implemented
+                cardEffects.Add(CardEffectFactory.TrainingEffect(card: card));
             }
 
             #endregion

+ 1 - 1
Assets/CardEffect/EX9/Yellow/EX9_026.cs

@@ -29,7 +29,7 @@ namespace DCGO.CardEffects.EX9
 
             if (timing == EffectTiming.OnDeclaration)
             {
-                // To be implemented
+                cardEffects.Add(CardEffectFactory.TrainingEffect(card: card));
             }
 
             #endregion

+ 2 - 2
Assets/CardEffect/EX9/Yellow/EX9_029.cs

@@ -27,9 +27,9 @@ namespace DCGO.CardEffects.EX9
 
             #region Training
 
-            if (timing == EffectTiming.None)
+            if (timing == EffectTiming.OnDeclaration)
             {
-                // To be Implemented
+                cardEffects.Add(CardEffectFactory.TrainingEffect(card: card));
             }
 
             #endregion

+ 16 - 0
Assets/Scenes/BattleScene.unity

@@ -18184,6 +18184,7 @@ GameObject:
   - component: {fileID: 198236662}
   - component: {fileID: 198236661}
   - component: {fileID: 198236663}
+  - component: {fileID: 198236664}
   m_Layer: 0
   m_Name: GManager
   m_TagString: Untagged
@@ -18237,6 +18238,8 @@ MonoBehaviour:
   DebuffSE: {fileID: 8300000, guid: 6435d2fe6607fe040b957ce33d550aec, type: 3}
   DigiXrosSelectCardEffect: {fileID: 100004, guid: 66cc48e0294709b4ab3958c8a243b0ba, type: 3}
   DigiXrosSelectCardEffectSE: {fileID: 8300000, guid: 27f3b38afa2b9da44915f77d9eb0c7d6, type: 3}
+  AssemblySelectCardEffect: {fileID: 0}
+  AssemblySelectCardEffectSE: {fileID: 0}
   FreezeSE: {fileID: 8300000, guid: 949e1686482c3d2439a1d7242d9f6828, type: 3}
   HealLifeEffect: {fileID: 100008, guid: bc00d416d18684a42ae0ecb244d2fa95, type: 3}
   HealLifeSE: {fileID: 8300000, guid: 3c8669efb2f62b645a53ef51b5979db2, type: 3}
@@ -18584,6 +18587,18 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _selectedCount: 0
   _endSelect: 0
+--- !u!114 &198236664
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 198236640}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 69f9ca96bc7186a45880ab24f159e284, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &208123383
 GameObject:
   m_ObjectHideFlags: 0
@@ -43641,6 +43656,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   commandText: {fileID: 1573802145}
   digiXrosObject: {fileID: 1798886764}
+  assemblyObject: {fileID: 0}
 --- !u!95 &507911419
 Animator:
   serializedVersion: 4