new attack effects

Assets/MD/Scripts/CameraControl.cs

@@ -10,6 +10,14 @@ public class CameraControl : MonoBehaviour
     {
         Instance = this;
     }
+    public static void ShakeCameraNowBig()
+    {
+        Instance.StatShakeCameraDelay(0, true);
+    }
+    public static void ShakeCameraNowSmall()
+    {
+        Instance.StatShakeCameraDelay(0, false);
+    }
     public static void ShakeCamera(float t, bool big = true)
     {
         Instance.StatShakeCameraDelay(t, big);

Assets/MD/Scripts/CardAnimation.cs

@@ -116,7 +116,6 @@ public class CardAnimation : MonoBehaviour
         {
             CloseUpControl cc = transform.Find("mod_simple_quad(Clone)").GetChild(0).GetComponent<CloseUpControl>();
             cc.FadeOut(0.167f);
-            ;
         }
         StartCoroutine(DelayActivateQuad(0.75f + 0.167f));
     }

Assets/MD/Scripts/CloseUpControl.cs

@@ -33,4 +33,12 @@ public class CloseUpControl : MonoBehaviour
     {
         DOTween.To(() => alpha, x => alpha = x, 0f, time);
     }
+    public void FadeOutIn(float timeWait1, float timeOut, float timeWait2, float timeIn)
+    {
+        Sequence quence = DOTween.Sequence();
+        quence.AppendInterval(timeWait1);
+        quence.Append(DOTween.To(() => alpha, x => alpha = x, 0f, timeOut));
+        quence.AppendInterval(timeWait2);
+        quence.Append(DOTween.To(() => alpha, x => alpha = x, 1f, timeIn));
+    }
 }

Assets/MD/Scripts/Shortcuts.cs

@@ -206,10 +206,10 @@ public class Shortcuts : MonoBehaviour
         }
 
         Time.timeScale = timescale;
-        if (message != Program.I().ocgcore.currentMessage)
-        {
-            message = Program.I().ocgcore.currentMessage;
-            Debug.Log(message);
-        }
+        //if (message != Program.I().ocgcore.currentMessage)
+        //{
+        //    message = Program.I().ocgcore.currentMessage;
+        //    Debug.Log(message);
+        //}
     }
 }

Assets/MD/Test/Test.unity

@@ -219,7 +219,7 @@ Transform:
   m_LocalScale: {x: 100, y: 1, z: 100}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &123417882
 GameObject:
@@ -346,7 +346,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &315797831
 GameObject:
@@ -655,7 +655,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &408335504
 GameObject:
@@ -890,72 +890,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!1 &819399764
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 819399767}
-  - component: {fileID: 819399766}
-  - component: {fileID: 819399765}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &819399765
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 819399764}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
---- !u!114 &819399766
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 819399764}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 10
---- !u!4 &819399767
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 819399764}
-  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_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1216886575
 GameObject:
   m_ObjectHideFlags: 0
@@ -986,7 +920,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!320 &1216886577
 PlayableDirector:
@@ -1229,7 +1163,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1351326601
 GameObject:
@@ -1357,7 +1291,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1351326604
 MonoBehaviour:
@@ -1487,7 +1421,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 13
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1897184762
 GameObject:

Assets/MD/Test/TestLoad.cs

@@ -9,9 +9,9 @@ using UnityEngine;
 
 public class TestLoad : MonoBehaviour
 {
-    void Start()
+    void OnEnable()
     {
-        var a1 = ABLoader.LoadABFolder("effects/other");
+        var a1 = ABLoader.LoadABFolder("effects/hit");
+        //a1.transform.DOMoveZ(10, 1);
     }
-
 }

Assets/SibylSystem/Ocgcore/OCGobjects/gameCard.cs

@@ -70,6 +70,8 @@ public class gameCard : OCGobject
 
     public bool cookie_cared = false;
 
+    public bool inAnimation = false;
+
     public int counterCANcount = 0;
 
     public int counterSELcount = 0;
@@ -900,6 +902,10 @@ public class gameCard : OCGobject
 
     public void UA_flush_all_gived_witn_lock(bool rush, float voiceTime = 0)
     {
+        if (gameObject.GetComponent<TraceCard>().trace)
+        {
+            Debug.Log(get_data().Name + "--动了");
+        }
         if (Vector3.Distance(gived_position, accurate_position) > 0.001f ||
             Vector3.Distance(gived_rotation, accurate_rotation) > 0.001f)
         {
@@ -1313,6 +1319,8 @@ public class gameCard : OCGobject
 
     public void TweenTo(Vector3 pos, Vector3 rot, float delay = 0f, float newtime = 0f, bool exciting = false, iTween.EaseType easeType = iTween.EaseType.easeOutQuad) //mark 卡片移动功能
     {
+        if (inAnimation)
+            return;
         var time = 0.1f;
         time += Vector3.Distance(pos, gameObject.transform.position) * 0.2f / 30f;
         if (time < 0.1f) time = 0.1f;

Assets/TraceCard.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class TraceCard : MonoBehaviour
+{
+    public bool trace;
+}

Assets/TraceCard.cs.meta

+fileFormatVersion: 2
+guid: f3818b34b5c4ac64fa7a6f1e143dff52
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/old/Ocgcore/card/mod_ocgcore_card.prefab

@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 427468}
   - component: {fileID: 1402605852}
+  - component: {fileID: 2711716875583030410}
   m_Layer: 0
   m_Name: mod_ocgcore_card
   m_TagString: Untagged
@@ -53,6 +54,19 @@ MonoBehaviour:
   summon: 0
   landTime: 0
   type: 
+--- !u!114 &2711716875583030410
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 100424}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f3818b34b5c4ac64fa7a6f1e143dff52, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  trace: 0
 --- !u!1 &109792
 GameObject:
   m_ObjectHideFlags: 0

ProjectSettings/ProjectSettings.asset

@@ -3,7 +3,7 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 22
+  serializedVersion: 23
   productGUID: 23639be819f24d044ae93a28448a771b
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
@@ -152,11 +152,12 @@ PlayerSettings:
   m_ColorGamuts: 00000000
   targetPixelDensity: 30
   resolutionScalingMode: 0
+  resetResolutionOnWindowResize: 0
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
     Android: com.YGOPro2.YGOPro2
-    Standalone: com.YGOPro2.YGOPro2
+    Standalone: com.MDPro2.MDPro2
     Tizen: com.YGOPro2.YGOPro2
     iPhone: com.YGOPro2.YGOPro2
     tvOS: com.YGOPro2.YGOPro2
@@ -532,6 +533,7 @@ PlayerSettings:
   switchNetworkInterfaceManagerInitializeEnabled: 1
   switchPlayerConnectionEnabled: 1
   switchUseNewStyleFilepaths: 0
+  switchUseLegacyFmodPriorities: 1
   switchUseMicroSleepForYield: 1
   switchEnableRamDiskSupport: 0
   switchMicroSleepForYieldTime: 25
@@ -742,6 +744,7 @@ PlayerSettings:
     m_VersionName: 
   apiCompatibilityLevel: 6
   activeInputHandler: 0
+  windowsGamepadBackendHint: 0
   cloudProjectId: 
   framebufferDepthMemorylessMode: 0
   qualitySettingsNames: []