fix bugs & new shader for spine

.gitignore

@@ -55,3 +55,5 @@ Assets/Spine/
 Assets/SpineWallpaper/
 Assets/StreamingAssets/
 Assets/Texture/
+Assets/desktop.ini.meta
+Assets/desktop.ini

Assets/Main.unity

@@ -6610,7 +6610,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.99988, y: 0}
+  m_AnchoredPosition: {x: -399.99982, y: 0}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &129642814
@@ -7533,7 +7533,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: -490.00037, y: 0}
+  m_AnchoredPosition: {x: -490.0003, y: 0}
   m_SizeDelta: {x: 490, y: 2000}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &153416284
@@ -12568,7 +12568,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.49988, y: -540}
+  m_AnchoredPosition: {x: 247.49982, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &250597853
@@ -15139,7 +15139,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.49988, y: -540}
+  m_AnchoredPosition: {x: 247.49982, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &296823158
@@ -17255,7 +17255,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.99988, y: 300}
+  m_AnchoredPosition: {x: -399.99982, y: 300}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &365844423
@@ -33247,7 +33247,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.49988, y: -540}
+  m_AnchoredPosition: {x: 247.49982, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &681567863
@@ -34004,7 +34004,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
@@ -35899,7 +35899,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.99988, y: -60}
+  m_AnchoredPosition: {x: -419.99982, y: -60}
   m_SizeDelta: {x: 400, y: 760}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &736958434
@@ -37254,7 +37254,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 476827028}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.40660203
+  m_Size: 0.61646974
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -49173,7 +49173,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.49988, y: -540}
+  m_AnchoredPosition: {x: 247.49982, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1005556390
@@ -53277,7 +53277,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}
+  m_AnchoredPosition: {x: 0, y: 0.000030517578}
   m_SizeDelta: {x: 0, y: 300}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!1 &1117266860
@@ -65659,7 +65659,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.49988, y: -540}
+  m_AnchoredPosition: {x: 247.49982, y: -540}
   m_SizeDelta: {x: -565, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1371617110
@@ -65811,7 +65811,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.99988, y: 150}
+  m_AnchoredPosition: {x: -399.99982, y: 150}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &1374530642
@@ -73615,6 +73615,7 @@ MonoBehaviour:
   attackingCard: {fileID: 0}
   materialCards: []
   cardsInChain: []
+  codesInChain: 
   cardsBeTarget: []
   cardsInSelection: []
   cardsMustBeSelected: []
@@ -88508,7 +88509,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.99988, y: -150}
+  m_AnchoredPosition: {x: -399.99982, y: -150}
   m_SizeDelta: {x: -1350, y: 80}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &1800729521

Assets/Scripts/MDPro3/Servants/OcgCore.cs

@@ -4471,8 +4471,9 @@ namespace MDPro3
                                 ES_selectHint = InterString.Get("请为对方的「[?]」选择位置。", CardsManager.Get(Es_selectMSGHintData).Name);
                         }
                     }
-                    else
+                    else if (ES_selectHint == "")
                         ES_selectHint = StringHelper.GetUnsafe(570);//请选择要变成不能使用的卡片区域
+
                     hintObj.SetActive(true);
                     hintText.text = ES_selectHint;
                     break;
@@ -4692,6 +4693,7 @@ namespace MDPro3
             }
             CloseBgHint();
             FieldSelectReset();
+            ES_selectHint = string.Empty;
         }
 
         #endregion
@@ -5317,24 +5319,28 @@ namespace MDPro3
             fieldExitable = exitable;
             fieldSendable = sendable;
             fieldCounterCount = 0;
-            RefreshButton();
 
             hintObj.SetActive(true);
             if (currentMessage == GameMessage.SelectCard
                 || currentMessage == GameMessage.SelectCounter)
                 hintText.text = fieldHint + ": " + 0 + "/" + fieldMax;
-            else if(currentMessage == GameMessage.SelectSum && !ES_overFlow)
+            else if(currentMessage == GameMessage.SelectSum)
             {
-                foreach (var place in places)
-                    if (place.cardSelecting)
-                        if (!place.cardSelected)
-                            if (CheckSelectableInSum(cardsInSelection, place.cookieCard, cardsMustBeSelected, ES_max))
-                                place.CardInThisZoneSelectable();
-                            else
-                                place.CardInThisZoneUnselectable();
+                if(!ES_overFlow)
+                    foreach (var place in places)
+                        if (place.cardSelecting)
+                            if (!place.cardSelected)
+                                if (CheckSelectableInSum(cardsInSelection, place.cookieCard, cardsMustBeSelected, ES_max))
+                                    place.CardInThisZoneSelectable();
+                                else
+                                    place.CardInThisZoneUnselectable();
+                hintText.text = fieldHint + ": " + GetSelectLevelSum(cardsMustBeSelected)[0] + "/" + ES_level;
             }
             else
-                hintText.text = fieldHint;
+                if(!string.IsNullOrEmpty(fieldHint))
+                    hintText.text = fieldHint;
+
+            RefreshButton();
         }
 
         public void FieldSelectRefresh(GameCard card)
@@ -5436,6 +5442,8 @@ namespace MDPro3
                 if (currentMessage == GameMessage.SelectUnselect)
                     btnCancel.Hide();
             }
+            else
+                btnConfirm.Hide();
             if (fieldExitable)
             {
                 if (currentMessage == GameMessage.SelectUnselect && fieldSendable)
@@ -5444,7 +5452,8 @@ namespace MDPro3
                 else
                     btnCancel.Show();
             }
-
+            else
+                btnCancel.Hide();
         }
 
         void FieldSelectReset()
@@ -5534,8 +5543,14 @@ namespace MDPro3
                 popupPhase.Show();
             };
         }
+
+        string lastHint = string.Empty;
         public void ShowPopupSelectCard(string hint, List<GameCard> cards, int min, int max, bool exitable, bool sendable)
         {
+            if (string.IsNullOrEmpty(hint))
+                hint = lastHint;
+            else
+                lastHint = hint;
             var handler = Addressables.InstantiateAsync("PopupDuelSelectCard");
             handler.Completed += (result) =>
             {

Assets/Shader/TimelineShader_SM_SM_Shake_Shader.shader

+Shader "TimelineShader/SM/SM_Shake_Shader" {
+	Properties {
+		[NoScaleOffset] _MainTex ("_MainTex", 2D) = "white" {}
+		Vector1_5cc3d821a68e4acb9ac135067244a058 ("Transparent", Range(0, 1)) = 1
+		_ShakeRolling ("ShakeRolling", Range(-0.3, 0.1)) = 0.03
+		[ToggleUI] _Shake_X ("Shake_X", Float) = 1
+		_Shakeparticle ("Shakeparticle", Range(0, 1000)) = 100
+		[ToggleUI] _Shake_Y ("Shake_Y", Float) = 0
+		_ShakeSpeed ("ShakeSpeed", Range(0, 5)) = 0.3
+		[NoScaleOffset] _ShaderNoize ("ShaderNoize", 2D) = "white" {}
+		[HideInInspector] [NoScaleOffset] unity_Lightmaps ("unity_Lightmaps", 2DArray) = "" {}
+		[HideInInspector] [NoScaleOffset] unity_LightmapsInd ("unity_LightmapsInd", 2DArray) = "" {}
+		[HideInInspector] [NoScaleOffset] unity_ShadowMasks ("unity_ShadowMasks", 2DArray) = "" {}
+	}
+	//DummyShaderTextExporter
+	SubShader{
+		Tags { "RenderType"="Opaque" }
+		LOD 200
+		CGPROGRAM
+#pragma surface surf Standard
+#pragma target 3.0
+
+		sampler2D _MainTex;
+		struct Input
+		{
+			float2 uv_MainTex;
+		};
+
+		void surf(Input IN, inout SurfaceOutputStandard o)
+		{
+			fixed4 c = tex2D(_MainTex, IN.uv_MainTex);
+			o.Albedo = c.rgb;
+			o.Alpha = c.a;
+		}
+		ENDCG
+	}
+	Fallback "Hidden/Shader Graph/FallbackError"
+}
\ No newline at end of file

Assets/Shader/TimelineShader_SM_SM_Shake_Shader.shader.meta

+fileFormatVersion: 2
+guid: 830158a817299204097e43b4a97e8678
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  preprocessorOverride: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/ProjectSettings.asset

@@ -529,7 +529,7 @@ PlayerSettings:
     m_APIs: 0b000000
     m_Automatic: 1
   - m_BuildTarget: WindowsStandaloneSupport
-    m_APIs: 0b000000020000001200000015000000
+    m_APIs: 0200000012000000150000000b000000
     m_Automatic: 0
   m_BuildTargetVRSettings:
   - m_BuildTarget: Standalone