mbunch_kascope před 1 rokem
rodič
revize
a865bfcfe0

+ 1 - 0
Assets/CardEffect/BT20/Purple/BT20_080.cs

@@ -50,6 +50,7 @@ namespace DCGO.CardEffects.BT20
                 bool CanSelectCard(CardSource source)
                 {
                     return source.HasLevel && source.Level <= 4 &&
+                           !source.IsDigiEgg &&
                            (source.HasSocTraits || source.HasSeekersTraits) &&
                            CardEffectCommons.CanPlayAsNewPermanent(source, false, activateClass, SelectCardEffect.Root.Trash);
                 }

+ 1 - 1
Assets/CardEffect/BT22/White/BT22_007.cs

@@ -260,7 +260,7 @@ namespace DCGO.CardEffects.BT22
 
             #region Remove Field - Reset DP
 
-            if (timing == EffectTiming.WhenRemoveField)
+            if (timing == EffectTiming.OnRemovedField)
             {
                 ActivateClass activateClass = new ActivateClass();
                 activateClass.SetUpICardEffect("", CanUseCondition, card);

+ 1 - 1
Assets/CardEffect/EX6/White/EX6_072.cs

@@ -63,7 +63,7 @@ namespace DCGO.CardEffects.EX6
                     {
                         if (cardSource.HasLevel && cardSource.Level == 7)
                         {
-                            if (cardSource.jogressCondition != null)
+                            if (cardSource.jogressCondition.Count > 0)
                                 return true;
                         }
                     }

+ 1 - 0
Assets/CardEffect/LM/Black/LM_043.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 
 //Darkdramon
 namespace DCGO.CardEffects.LM

+ 93 - 93
Assets/Scenes/Opening.unity

@@ -35769,7 +35769,7 @@ MonoBehaviour:
         m_Calls:
         - m_Target: {fileID: 1049396035}
           m_TargetAssemblyTypeName: PatchNotes, Assembly-CSharp
-          m_MethodName: OnClickOpenPatchNotesPanelButton
+          m_MethodName: OpenPatchNotes
           m_Mode: 1
           m_Arguments:
             m_ObjectArgument: {fileID: 0}
@@ -37415,6 +37415,97 @@ MonoBehaviour:
   m_Spacing: {x: 133.6, y: 0}
   m_Constraint: 2
   m_ConstraintCount: 1
+--- !u!21 &830001284
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Shapes2D Material
+  m_Shader: {fileID: 4800000, guid: 44f74e30da9814584b2fdcdbe799e51a, type: 3}
+  m_ValidKeywords:
+  - FILL_SOLID_COLOR
+  - RECTANGLE
+  m_InvalidKeywords:
+  - _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Shapes2D_DstAlpha: 1
+    - _Shapes2D_DstBlend: 10
+    - _Shapes2D_SrcAlpha: 1
+    - _Shapes2D_SrcBlend: 1
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
 --- !u!1 &832792738
 GameObject:
   m_ObjectHideFlags: 0
@@ -98049,97 +98140,6 @@ MonoBehaviour:
   _fontSize_JPN: 14
   _text_ENG: Show alt arts
   _text_JPN: "\u30D1\u30E9\u30EC\u30EB\u7248\u3092\u8868\u793A\u3059\u308B"
---- !u!21 &2031521880
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Shapes2D Material
-  m_Shader: {fileID: 4800000, guid: 44f74e30da9814584b2fdcdbe799e51a, type: 3}
-  m_ValidKeywords:
-  - FILL_SOLID_COLOR
-  - RECTANGLE
-  m_InvalidKeywords:
-  - _EMISSION
-  m_LightmapFlags: 1
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _ColorMask: 15
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _Shapes2D_DstAlpha: 1
-    - _Shapes2D_DstBlend: 10
-    - _Shapes2D_SrcAlpha: 1
-    - _Shapes2D_SrcBlend: 1
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Stencil: 0
-    - _StencilComp: 8
-    - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []
 --- !u!1 &2035620824
 GameObject:
   m_ObjectHideFlags: 0
@@ -117891,7 +117891,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2031521880}
+  m_Material: {fileID: 830001284}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}

+ 1 - 1
Assets/Scripts/CEntity_Base.cs

@@ -335,7 +335,7 @@ public class CEntity_Base : ScriptableObject
     #endregion
 
     #region Wheter the card has play cost
-    public bool HasPlayCost => cardKind != CardKind.DigiEgg && cardKind != CardKind.Option && PlayCost >= 0;
+    public bool HasPlayCost => cardKind != CardKind.Option && PlayCost >= 0;
     #endregion
 
     #region Wheter the card has use cost

+ 1 - 0
Assets/Scripts/CardEffectCommons/MinMax_DP_Cost_Level/Cost/IsMinCost.cs

@@ -16,6 +16,7 @@ public partial class CardEffectCommons
         if (IsDigimonOnly)
         {
             if (!permanent.IsDigimon) return false;
+
             var costs = permanent.TopCard.Owner.GetBattleAreaDigimons()
                 .Filter(x => x.TopCard.HasPlayCost)
                 .Select(x => x.TopCard.GetCostItself).ToList();

+ 8 - 0
Assets/Scripts/CardObjectController.cs

@@ -508,6 +508,14 @@ public class CardObjectController : MonoBehaviour
         if (permanent == null) yield break;
         if (permanent.TopCard == null) yield break;
 
+        yield return ContinuousController.instance.StartCoroutine(GManager.instance.autoProcessing_CutIn.StackSkillInfos(
+            CardEffectCommons.WhenPermanentWouldRemoveFieldCheckHashtable(
+                new List<Permanent> { permanent },
+                null,
+                null
+            ),
+            EffectTiming.OnRemovedField));
+
         if (!ignoreOverflow)
         {
             yield return ContinuousController.instance.StartCoroutine(new AceOverflowClass(permanent.cardSources).Overflow());

+ 2 - 1
Assets/Scripts/ICardEffect.cs

@@ -924,7 +924,8 @@ public enum EffectTiming
     WhenWouldDigivolutionCardDiscarded,
     WhenLinked,
     WhenTopCardTrashed,
-    RulesTiming
+    RulesTiming,
+    OnRemovedField
 }
 
 #endregion

+ 5 - 0
Assets/Scripts/PatchNotes.cs

@@ -20,6 +20,11 @@ public class PatchNotes : OffAnimation
         Application.OpenURL("https://forms.gle/GhZgGVJS1qLeUMcG8");
     }
 
+    public void OpenPatchNotes()
+    {
+        Application.OpenURL("https://dcgo.online/PatchNotes.html");
+    }
+
     public IEnumerator Open()
     {
         _verText.text = $"Patch Notes ver{ContinuousController.instance.GameVerString}";

+ 2 - 2
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79fa3a5fabc91c82d8251f614e9294f9d9e39bc8a53396f971dcd63bbb0a1107
-size 20167
+oid sha256:17727c50620c5b457ec059f8e9a5fce3f8a9dabad66a7b4f9c955404b40a4535
+size 20170