这里取屏蔽掉以前下载好的后面的操作

7b6274f0 · JiangWanZhi · 803bc42e · 7b6274f0 · 7b6274f0 · 7b6274f0
Commit 7b6274f0 authored Aug 17, 2023 by JiangWanZhi
12 changed files
--- a/Assets/Editor/ExTextEditor.cs
+++ b/Assets/Editor/ExTextEditor.cs
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+
+
+[CustomEditor(typeof(ExText))]
+public class ExTextEditor : Editor
+{
+    public override void OnInspectorGUI()
+    {
+        ExText t = target as ExText;
+        t.isUseActive = EditorGUILayout.Toggle("ǷӦ", t.isUseActive);
+        base.OnInspectorGUI();
+    }
+}
--- a/Assets/Editor/ExTextEditor.cs.meta
+++ b/Assets/Editor/ExTextEditor.cs.meta
+fileFormatVersion: 2
+guid: 4df351388788e484dbfc15294f9f0e7b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/SpriteAtls/Sprites.spriteatlasv2.meta
+++ b/Assets/Resources/SpriteAtls/Sprites.spriteatlasv2.meta
@@ -16,7 +16,7 @@ SpriteAtlasImporter:
  platformSettings: []
  packingSettings:
    serializedVersion: 2
-    padding: 4
+    padding: 8
    blockOffset: 1
    allowAlphaSplitting: 0
    enableRotation: 1

--- a/Assets/Resources/perfabs/ImageParent.prefab
+++ b/Assets/Resources/perfabs/ImageParent.prefab
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1261121859384453673
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5824493431172321126}
+  m_Layer: 0
+  m_Name: ImageParent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5824493431172321126
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1261121859384453673}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
--- a/Assets/Resources/perfabs/ImageParent.prefab.meta
+++ b/Assets/Resources/perfabs/ImageParent.prefab.meta
+fileFormatVersion: 2
+guid: 3e10d426f17d6d9459101a3909122287
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/perfabs/areaGroupId.prefab
+++ b/Assets/Resources/perfabs/areaGroupId.prefab
@@ -10,7 +10,7 @@ GameObject:
  m_Component:
  - component: {fileID: 7163907760306130737}
  - component: {fileID: 810986338845534415}
-  - component: {fileID: 7814886791916200456}
+  - component: {fileID: 7251325146228930394}
  m_Layer: 5
  m_Name: areaGroupId
  m_TagString: Untagged
@@ -46,7 +46,7 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2431009658991780423}
  m_CullTransparentMesh: 1
--- !u!114 &7814886791916200456
+--- !u!114 &7251325146228930394
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -55,18 +55,18 @@ MonoBehaviour:
  m_GameObject: {fileID: 2431009658991780423}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Script: {fileID: 11500000, guid: 658c6ece9bc787940918e4b7f413a037, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_text: 0
+  m_text: 1
  m_isRightToLeft: 0
  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -97,9 +97,9 @@ MonoBehaviour:
  m_fontSizeBase: 36
  m_fontWeight: 400
  m_enableAutoSizing: 0
-  m_fontSizeMin: 10
+  m_fontSizeMin: 18
  m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 1
  m_HorizontalAlignment: 2
  m_VerticalAlignment: 512
  m_textAlignment: 65535
@@ -117,8 +117,8 @@ MonoBehaviour:
  m_enableKerning: 1
  m_enableExtraPadding: 0
  checkPaddingRequired: 0
-  m_isRichText: 0
-  m_parseCtrlCharacters: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
  m_isOrthographic: 1
  m_isCullingEnabled: 0
  m_horizontalMapping: 0
@@ -127,7 +127,7 @@ MonoBehaviour:
  m_geometrySortingOrder: 0
  m_IsTextObjectScaleStatic: 0
  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 0
+  m_useMaxVisibleDescender: 1
  m_pageToDisplay: 1
  m_margin: {x: 0, y: 0, z: 0, w: 0}
  m_isUsingLegacyAnimationComponent: 0
@@ -135,3 +135,4 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_baseMaterial: {fileID: 0}
  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+  isUseActive: 1
--- a/Assets/Scenes/gameScene.unity
+++ b/Assets/Scenes/gameScene.unity
@@ -158,7 +158,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -323, y: 483}
+  m_AnchoredPosition: {x: -312.6, y: 483}
  m_SizeDelta: {x: 388.64, y: 38.710022}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2435910
@@ -806,6 +806,7 @@ MonoBehaviour:
  TipBtn: {fileID: 3394804452262531086}
  AutoBtn: {fileID: 1354215336290540113}
  CloseBtn: {fileID: 669974489}
+  Test_Text: {fileID: 1230079831}
 --- !u!1 &302737823
 GameObject:
  m_ObjectHideFlags: 0
@@ -978,6 +979,7 @@ RectTransform:
  m_Children:
  - {fileID: 1147557151012020857}
  - {fileID: 1955086771}
+  - {fileID: 577897817}
  m_Father: {fileID: 0}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1059,6 +1061,83 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 6616910588763818716, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
  m_PrefabInstance: {fileID: 633571717665653991}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &577897816
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 577897817}
+  - component: {fileID: 577897819}
+  - component: {fileID: 577897818}
+  m_Layer: 0
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &577897817
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 577897816}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1230079830}
+  m_Father: {fileID: 414882564}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 8.23, y: 49}
+  m_SizeDelta: {x: 635.8, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &577897818
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 577897816}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &577897819
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 577897816}
+  m_CullTransparentMesh: 1
 --- !u!1 &581143679
 GameObject:
  m_ObjectHideFlags: 0
@@ -1704,7 +1783,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 7, y: 0}
+  m_AnchoredPosition: {x: -4, y: -26.000006}
  m_SizeDelta: {x: 506, y: 730}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &945105134
@@ -1858,7 +1937,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -162, y: 213.90002}
+  m_AnchoredPosition: {x: -188.1, y: 192.2}
  m_SizeDelta: {x: 629.11, y: 101.33002}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1083628062
@@ -2310,6 +2389,86 @@ RectTransform:
  m_AnchoredPosition: {x: -273, y: 7.6}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1230079829
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1230079830}
+  - component: {fileID: 1230079832}
+  - component: {fileID: 1230079831}
+  m_Layer: 0
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1230079830
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1230079829}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 577897817}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0.000030518, y: 0.000062943}
+  m_SizeDelta: {x: 635.8, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1230079831
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1230079829}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 34
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 52
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5F53\u524D\u7F29\u653E\uFF1A0.22"
+--- !u!222 &1230079832
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1230079829}
+  m_CullTransparentMesh: 1
 --- !u!1 &1258747874
 GameObject:
  m_ObjectHideFlags: 0
@@ -3682,6 +3841,42 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1937327275}
  m_CullTransparentMesh: 1
+--- !u!1 &1943337311
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1943337312}
+  m_Layer: 5
+  m_Name: PlayImageParent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1943337312
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1943337311}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1147557151012020857}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1950670428
 GameObject:
  m_ObjectHideFlags: 0
@@ -3835,7 +4030,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.00080380775, y: -0.000030144434}
  m_SizeDelta: {x: -276, y: 174.46}
  m_Pivot: {x: 0, y: 1}
 --- !u!114 &1994532033
@@ -4190,7 +4385,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 6.9999995, y: 0}
+  m_AnchoredPosition: {x: -4, y: -26}
  m_SizeDelta: {x: 492, y: 716}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2077948430
@@ -5004,6 +5199,7 @@ RectTransform:
  - {fileID: 8264718637096921617}
  - {fileID: 6714159874655592954}
  - {fileID: 551004409273782827}
+  - {fileID: 1943337312}
  m_Father: {fileID: 414882564}
  m_RootOrder: -1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8751,6 +8947,7 @@ MonoBehaviour:
  tempValue2: 120
  cam: {fileID: 0}
  ListMoveOffSet: 35
+  PlayImagePaent: {fileID: 1943337312}
 --- !u!1 &8136062125027934181
 GameObject:
  m_ObjectHideFlags: 0

--- a/Assets/scripts/ExText.cs
+++ b/Assets/scripts/ExText.cs
+using System.Collections;
+using System.Collections.Generic;
+using System.Drawing;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class ExText : TextMeshProUGUI
+{
+    public static float size = 1; //当前缩放倍数
+    public static Vector4 param = new Vector4(0.3f, 25, 0.1f, 1);    // x的值以下隐藏   y：缩放等于x的缩放倍数的时候，大于等于y这个字号的字显示   z：基于x、y 每增加z值的缩放，w：允许显示的字号减去w值      //缩放小于x的值就全部隐藏，在大于等于x的值后，缩放每增加z的值，字号就会把y值减去w值的字体显示出来
+
+    public static List<ExText> list = new List<ExText>();
+    public static void SizeChange(float f)
+    {
+        if (size == f)
+        {
+            return;
+        }
+        size = f;
+        for (int i = 0; i < list.Count; i++)
+        {
+            ExText text = list[i];
+            if (size < param.x)
+            {
+                text.gameObject.SetActive(false);
+            }
+            else
+            {
+                if(text.fontSize >= (param.y - (int)((size - param.x) / param.z) * param.w))
+                {
+                    text.gameObject.SetActive(true);
+                }
+                else
+                {
+                    text.gameObject.SetActive(false);
+                }
+            }
+        }
+    }
+
+    public bool isUseActive = false;
+    protected override void Start()
+    {
+        base.Start();
+        if (isUseActive)
+        {
+            list.Add(this);
+        }
+    }
+}
--- a/Assets/scripts/ExText.cs.meta
+++ b/Assets/scripts/ExText.cs.meta
+fileFormatVersion: 2
+guid: 658c6ece9bc787940918e4b7f413a037
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/scripts/ScaleToImage.cs
+++ b/Assets/scripts/ScaleToImage.cs
 using DG.Tweening;
+using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
-using Debug = UnityEngine.Debug;
+using UnityEngine.UI;

 public class ScaleToImage : MonoBehaviour
 {
@@ -41,6 +43,13 @@ public class ScaleToImage : MonoBehaviour

    private Vector3 SavePos_Scale; //这个是保存放大到最大的倍数的时候回正的位置
    private float clickTime;
+    private float NowScale;
+
+    private List<float> ScaleSize_List = new List<float>();
+    private int ListMaxNum = 10;
+
+    public Text Test_Text;
+    private float testscale = 1f;
    private void Update()
    {
        if (Input.touchCount == 2)
@@ -59,6 +68,7 @@ public class ScaleToImage : MonoBehaviour
                    {
                        target.GetChild(i).DOScale(Vector3.one * MinScale, 0.3f);
                    }
+                    NowScale = MinScale;
                }
                else if (target.GetChild(0).localScale.x >= MaxScale)   //大的回来小
                {
@@ -67,14 +77,29 @@ public class ScaleToImage : MonoBehaviour
                        target.GetChild(i).DOScale(Vector3.one * MaxScale, 0.3f);
                        target.GetChild(i).DOMove(SavePos_Scale, 0.3f).onComplete=()=> { IsPlayAniFlag = false; };
                    }
+                    NowScale = MaxScale;
                }
                PlayAniFlag_Scale = false;
                IsPlayAniFlag = true;
+                ChangeFontSize(NowScale);
            }
+            StopScaleToSetSize();
            Move();
        }
    }

+    private void StopScaleToSetSize()
+    {
+        if (ScaleSize_List.Count > 0)
+        {
+            ChangeFontSize(ScaleSize_List[ScaleSize_List.Count - 1]);
+            ScaleSize_List.Clear();
+        }
+    }
+    private void ChangeFontSize(float scalesize)
+    {
+        ExText.SizeChange(scalesize/2f);
+    }
    private void Scale()
    {
        if (!isInit_Scale)
@@ -125,6 +150,7 @@ public class ScaleToImage : MonoBehaviour
        //两指缩放比例
        float nowdis = Vector3.Distance(canvasCamera.ScreenToWorldPoint(Input.GetTouch(0).position), canvasCamera.ScreenToWorldPoint(Input.GetTouch(1).position));
        scale = nowdis / Vector3.Distance(touch1, touch2);  //大于1是放大，小于是缩小
+        bool isBig = scale > 1;

        //控制缩放速度
        scale = (scale - 1) * scaleSpeed;   //正的话就是放大图片  
@@ -140,30 +166,53 @@ public class ScaleToImage : MonoBehaviour
        }

        float scale_target = 0;
-
-        for (int i = 0; i < target.childCount; i++)
-        {
-            var item = target.GetChild(i);
        scale_target = (Vector3.one * (oriScale + scale)).x;
+        Vector3 targetscale;
        if (scale_target < Min_Move)
        {
-                item.localScale = Vector3.one * Min_Move * 0.99f;
+            targetscale = Vector3.one * Min_Move * 0.99f;
        }
        else if (scale_target > MaxScale)
        {
-                item.localScale = Vector3.one * (oriScale + scale);
+            targetscale = Vector3.one * (oriScale + scale);
            PlayAniFlag_Scale = true;
        }
        else
        {
-                item.localScale = Vector3.one * (oriScale + scale);
-                SavePos_Scale = item.position;
+            targetscale = Vector3.one * (oriScale + scale);
+            SavePos_Scale = target.GetChild(0).position;
        }
+
+
+        for (int i = 0; i < target.childCount; i++)
+        {
+            var item = target.GetChild(i);
+            item.localScale = targetscale;
+
            //改变目标位置，让位置保持不变
            item.position = oriPos - ToFigerCenter_Scale * (item.localScale.x - oriScale) * ToFigerdistance_Scale * MoveValue_Scale;
            item.localPosition = new Vector3(item.localPosition.x, item.localPosition.y, 0);
        }

+        NowScale = targetscale.x;
+        if (ScaleSize_List.Count < ListMaxNum)
+        {
+            ScaleSize_List.Add(NowScale);
+        }
+        else
+        {
+            if (isBig)
+            {
+                NowScale = ScaleSize_List.Max();
+            }
+            else
+            {
+                NowScale = ScaleSize_List.Min();
+            }
+            ScaleSize_List.Clear();
+            ChangeFontSize(NowScale);
+        }
+
    }

    private bool CanPlayLerpFlag;

--- a/Assets/scripts/Views/gameScene/gameSceneLogic.cs
+++ b/Assets/scripts/Views/gameScene/gameSceneLogic.cs
@@ -42,6 +42,8 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
    public ReplayCam cam;
    public float ListMoveOffSet = 35;

+    public Transform PlayImagePaent;  //操作的图片的父节点
+
    private int DestoryByGID = -1;
    Dictionary<string, EventChildItemBack> childEventHandlers = new Dictionary<string, EventChildItemBack>();

@@ -148,10 +150,6 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
    {
        ActionManages.update();

-        if (Input.GetKeyDown(KeyCode.A))
-        {
-            areaGroupList.transform.GetComponent<ScrollRect>().content.GetChild(textindex++).DOScale(0, 0.5f);
-        }
    }

    //创建列表item的时候回调并设置、初始化和刷新
@@ -459,6 +457,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
    }
    private void handlerLoadingPosition(Image image)  //进度条上面的图缩放一下
    {
+        return;   //这里先不去操作缩略图了
        Debug.Log("handlerLoadingPosition hand endl");
        image.gameObject.SetActive(true);
        image.color = new Color(1, 1, 1, 1);
@@ -502,6 +501,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
        }
        else
        {
+            return 0;  //下载完后先不操作了
            utilsTools.delTimeHandler(gameObject, "tryDownColorImg");
            Image image = transform.Find("ingameLoad/loadImg").GetComponent<Image>();
            Texture2D texture2d = data as Texture2D;
@@ -541,6 +541,19 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
        utilsTools.setGDataByKey("downGaoQing", utilsTools.getTotalMillisecond());
        gameShowView.GetComponent<mainGameView>().loadGameImgId();
    }
+
+    private void LoadResourcesPrefab() //去加载一个对图片进行操作的预制体
+    {
+        var obj_load = Resources.Load<GameObject>("perfabs/ImageParent");
+
+        var obj = GameObject.Instantiate(obj_load).transform;
+        obj.SetParent(PlayImagePaent);
+        obj.localPosition = Vector3.zero;
+        obj.localScale = Vector3.one;
+        obj.localRotation = Quaternion.Euler(0, 0, 0);
+
+        Resources.UnloadAsset(obj_load);
+    }
    //下载和解压zip    没有下载过就去下载线稿图
    void onInitViewShowDataEvent(List<UnityEngine.Object> uobjects, List<System.Object> objects)
    {

--- a/Assets/scripts/common/mainGameView.cs
+++ b/Assets/scripts/common/mainGameView.cs
@@ -586,6 +586,7 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
                }
                else
                {
+                    return 0; //这里下载好了就不进行操作了
                    utilsTools.saveImageDefaultMetaInfoToPath(localpath);
                    utilsTools.sendEventObjectParams(EventName.Event.Event_inGameLoadingValue, 8f, false);
                    Image image = null;
@@ -615,7 +616,8 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
                    return 1;
                }
            });
-        }else if(typeId == 3)
+        }
+        else if(typeId == 3)
        {
            utilsTools.httpDownText(this, url, localpath, (string id, string url1, bool isSuccess, System.Object data) =>
            {
@@ -630,6 +632,7 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
                }
                else
                {
+                    return 0; //这里下载好了就不进行操作了
                    utilsTools.setGDataByKey("downJsonBack", utilsTools.getTotalMillisecond());
                    utilsTools.sendEventObjectParams(EventName.Event.Event_inGameLoadingValue, 8f, false);
                    string jsondata = data as string;