Merge pull request '动效bug修理1022' (#216) from dev45-1021 into dev45-0703NewVer

Reviewed-on: #216

ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Blue.mat

@@ -349,7 +349,7 @@ Material:
     - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
     - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
     - _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
-    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.3610894, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0}
     - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Green.mat

@@ -349,7 +349,7 @@ Material:
     - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
     - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
     - _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
-    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.40275583, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0}
     - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Matal.mat

@@ -349,7 +349,7 @@ Material:
     - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
     - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
     - _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
-    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.2361565, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0}
     - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Red.mat

@@ -349,7 +349,7 @@ Material:
     - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
     - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
     - _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
-    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.40275583, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0}
     - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_White.mat

@@ -30,7 +30,7 @@ Material:
     m_Ints: []
     m_Floats: []
     m_Colors:
-    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.013911635, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.09347254, a: 0}
     - _Tex2offset: {r: 0.6, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
 --- !u!114 &558137770919511581

ColorlessWorld-2024-4-2/Assets/Particle Eff/Eff_UI/mat_FloorsPanel/mat_Yellow.mat

@@ -349,7 +349,7 @@ Material:
     - _MainTexRefine: {r: 1, g: 1, b: 1, a: 0}
     - _MaskPannerAndRotation: {r: 0, g: 0, b: 0, a: 0}
     - _MaskRefine: {r: 0, g: 1, b: 1, a: 0}
-    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.2361565, a: 0}
+    - _MaskTilingAndOffset: {r: 0.5, g: 1, b: 0.5, a: 0}
     - _Panner_Rotation: {r: 0, g: 0, b: 0, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
     - _Tex2Tiling: {r: 5, g: 0.33, b: 0, a: 0}

ColorlessWorld-2024-4-2/Assets/Particle Eff/Z_Scripts_45/AttackPreView.cs

@@ -24,7 +24,7 @@ public class AttackPreView : MonoBehaviour
 
     private void Start()
     {
-        AttackScorManager.Instance.AttackPreView = this;
+       // AttackScorManager.Instance.AttackPreView = this;
        // StartCoroutine(resigt());
     }
 

ColorlessWorld-2024-4-2/Assets/Plugins/Microsoft.CSharp.dll.meta

@@ -1,27 +0,0 @@
-fileFormatVersion: 2
-guid: a94cf6fef2879da4c91e5ef768aadf4e
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

@@ -195701,7 +195701,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1939047898}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b67420b3567c470478476514f822f194, type: 3}
   m_Name: