new final attack effects

Assets/Main.unity

@@ -38,7 +38,6 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -8065,7 +8064,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -399.9994, y: 0}
+  m_AnchoredPosition: {x: -399.99933, y: 0}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &129642814
@@ -9516,7 +9515,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: -489.99988, y: 0}
+  m_AnchoredPosition: {x: -490.00006, y: 0}
   m_SizeDelta: {x: 490, y: 2000}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &153416284
@@ -12173,7 +12172,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 247.49963, y: -540}
+  m_AnchoredPosition: {x: 247.49957, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &203992981
@@ -12313,7 +12312,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -95.00003}
+  m_AnchoredPosition: {x: 0, y: -95}
   m_SizeDelta: {x: 790, y: -190}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &204678201
@@ -15299,7 +15298,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 247.49963, y: -540}
+  m_AnchoredPosition: {x: 247.49957, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &250597853
@@ -19154,7 +19153,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 247.49963, y: -540}
+  m_AnchoredPosition: {x: 247.49957, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &296823158
@@ -21513,7 +21512,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -399.9994, y: 300}
+  m_AnchoredPosition: {x: -399.99933, y: 300}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &365844423
@@ -32725,7 +32724,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -60.00003}
+  m_AnchoredPosition: {x: 0, y: -60}
   m_SizeDelta: {x: -240, y: -120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &534387862
@@ -41201,7 +41200,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 247.49963, y: -540}
+  m_AnchoredPosition: {x: 247.49957, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &681567863
@@ -42294,7 +42293,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0.000030517578}
+  m_AnchoredPosition: {x: 0, y: -0.000030517578}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &702608002
@@ -44300,7 +44299,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -419.9994, y: -60}
+  m_AnchoredPosition: {x: -419.99957, y: -60}
   m_SizeDelta: {x: 400, y: 760}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &736958434
@@ -45849,7 +45848,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 476827028}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.6482535
+  m_Size: 0.6262164
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -59279,7 +59278,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 399.9994, y: -132}
+  m_AnchoredPosition: {x: 399.99933, y: -132}
   m_SizeDelta: {x: 330, y: 840}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &998933908
@@ -59881,7 +59880,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 247.49963, y: -540}
+  m_AnchoredPosition: {x: 247.49957, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1005556390
@@ -62859,7 +62858,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -60.00003}
+  m_AnchoredPosition: {x: 0, y: -60}
   m_SizeDelta: {x: -240, y: -120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1055201272
@@ -79788,7 +79787,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 247.49963, y: -540}
+  m_AnchoredPosition: {x: 247.49957, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1371617110
@@ -79940,7 +79939,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -399.9994, y: 150}
+  m_AnchoredPosition: {x: -399.99933, y: 150}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &1374530642
@@ -87078,7 +87077,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 65, y: 65.00003}
+  m_AnchoredPosition: {x: 65, y: 65}
   m_SizeDelta: {x: 60, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1484763997
@@ -106905,7 +106904,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -399.9994, y: -150}
+  m_AnchoredPosition: {x: -399.99933, y: -150}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &1800729521
@@ -112434,7 +112433,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 247.49963, y: -540}
+  m_AnchoredPosition: {x: 247.49957, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1895460095

Assets/Scripts/MDPro3/Managers/CameraManager.cs

@@ -27,6 +27,9 @@ namespace MDPro3
         public UniversalRenderPipelineAsset urpAssetForUI;
         public UniversalRendererData forwardRendererDataForUI;
 
+        public static Vector3 mainCameraDefaultPosition = new Vector3(0f, 95f, -37f);
+        public static Vector3 mainCameraDefaultRotation = new Vector3(70f, 0f, 0f);
+
         public override void Initialize()
         {
             base.Initialize();
@@ -214,6 +217,26 @@ namespace MDPro3
             }
         }
 
+        public static bool overlaySticking;
+        public static void Duel3DOverlayStickWithMain(bool stick)
+        {
+            if (stick)
+            {
+                overlaySticking = true;
+                Program.I().camera_.cameraDuelOverlay3D.transform.SetParent(Program.I().camera_.cameraMain.transform, false);
+                Program.I().camera_.cameraDuelOverlay3D.transform.localPosition = Vector3.zero;
+                Program.I().camera_.cameraDuelOverlay3D.transform.localEulerAngles = Vector3.zero;
+            }
+            else
+            {
+                overlaySticking = false;
+                Program.I().camera_.cameraDuelOverlay3D.transform.SetParent(Program.I().camera_.transform, false);
+                Program.I().camera_.cameraDuelOverlay3D.transform.localPosition = mainCameraDefaultPosition;
+                Program.I().camera_.cameraDuelOverlay3D.transform.localEulerAngles = mainCameraDefaultRotation;
+
+            }
+        }
+
         private void OnApplicationQuit()
         {
             cameraRenderTexture.targetTexture = null;

Assets/Scripts/MasterDuel/YgomSystem/Effect/ScreenEffect.cs

@@ -64,8 +64,8 @@ namespace YgomSystem.Effect
             if (useMainCameraSetting)
             {
                 cameraViewType = ViewType.View3D;
-                cameraPosition = new Vector3 (0, 95, -37);
-                cameraAngle = new Vector3(70, 0, 0);
+                cameraPosition = CameraManager.mainCameraDefaultPosition;
+                cameraAngle = CameraManager.mainCameraDefaultRotation;
                 overUI = false;
             }
 
@@ -94,6 +94,8 @@ namespace YgomSystem.Effect
 
         public void SetupCamera(Camera target)
 		{
+            if (target == Program.I().camera_.cameraDuelOverlay3D && CameraManager.overlaySticking)
+                return;
 			target.transform.localPosition = cameraPosition;
 			target.transform.localEulerAngles = cameraAngle;
 			if (target.name.Contains("2D"))

Assets/Scripts/Tools/AssetBundleRobber.cs

@@ -64,7 +64,8 @@ public class AssetBundleRobber : MonoBehaviour
 
         Initialize();
 
-        StartCoroutine(RefreshFileResources());
+        //StartCoroutine(RefreshFileResources());
+        //Copy("76500705");
     }
 
     void Copy(string path)

ProjectSettings/ProjectSettings.asset

@@ -551,7 +551,7 @@ PlayerSettings:
     m_APIs: 0b000000
     m_Automatic: 1
   - m_BuildTarget: WindowsStandaloneSupport
-    m_APIs: 1500000002000000
+    m_APIs: 0200000015000000
     m_Automatic: 0
   m_BuildTargetVRSettings:
   - m_BuildTarget: Standalone