Merge branch 'master' of gitlab.huolea.com:shujianhe/tusegamecolor

Assets/Resources/perfabs/GameMgr.prefab

@@ -5912,10 +5912,10 @@ MonoBehaviour:
   scaleSpeed: 1.2
   canvasCamera: {fileID: 0}
   scrollRect: {fileID: 1238786231969924280}
-  MinScale: 0.3
-  MaxScale: 6
-  Min_Move: 0.2
-  Max_Move: 7
+  MinScale: 0.375
+  MaxScale: 7
+  Min_Move: 0.23
+  Max_Move: 8
 --- !u!1 &8927003478227325637
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/gameScene.unity

@@ -772,86 +772,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a84e71b0940ee354b88759c457e77bf0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &378516905
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 378516906}
-  - component: {fileID: 378516908}
-  - component: {fileID: 378516907}
-  m_Layer: 5
-  m_Name: Text (Legacy)w
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &378516906
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 378516905}
-  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: -25, y: -707}
-  m_SizeDelta: {x: 310.26, y: 65.005}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &378516907
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 378516905}
-  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: 0, 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_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 20
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u521D\u59CB\u5316\u6D88\u8017\u7684\u65F6\u95F4\uFF1A"
---- !u!222 &378516908
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 378516905}
-  m_CullTransparentMesh: 1
 --- !u!1 &393047723
 GameObject:
   m_ObjectHideFlags: 0
@@ -2416,86 +2336,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1555736098}
   m_CullTransparentMesh: 1
---- !u!1 &1556700567
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1556700568}
-  - component: {fileID: 1556700570}
-  - component: {fileID: 1556700569}
-  m_Layer: 5
-  m_Name: Text (Legacy)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1556700568
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1556700567}
-  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: -25, y: -752}
-  m_SizeDelta: {x: 310.26, y: 65.005}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1556700569
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1556700567}
-  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: 0, 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_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 20
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u5E27\u6570\uFF1A01"
---- !u!222 &1556700570
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1556700567}
-  m_CullTransparentMesh: 1
 --- !u!1 &1591818771
 GameObject:
   m_ObjectHideFlags: 0
@@ -4771,8 +4611,6 @@ RectTransform:
   - {fileID: 6714159874655592954}
   - {fileID: 551004409273782827}
   - {fileID: 1943337312}
-  - {fileID: 1556700568}
-  - {fileID: 378516906}
   m_Father: {fileID: 414882564}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8722,8 +8560,6 @@ MonoBehaviour:
   AllProcress: {fileID: 1667660345673518993}
   AllProcress_Text: {fileID: 4457589912443491345}
   OffSet_CLickMove: 35
-  Text: {fileID: 1556700569}
-  Init_Text: {fileID: 378516907}
 --- !u!114 &9174292048928438190
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/scripts/Views/maingame/GroupListManager.cs

@@ -28,10 +28,6 @@ public class GroupListManager : MonoBehaviour
     private float ClickAreaCount;
     private List<colorItem> AllItem = new List<colorItem>();
 
-    private int Frame;
-    private float time;
-    public Text Text;
-    public Text Init_Text;
     private void Awake()
     {
         instance = this;
@@ -53,18 +49,6 @@ public class GroupListManager : MonoBehaviour
         EventDispatcher.RegisterEvent(EventName.Event.Event_ChoiseGroupByPic, Event_ChoiseGroupByPic, flag);
     }
 
-    private void Update()
-    {
-        Frame++;
-
-        time += Time.deltaTime;
-        if (time >= 1)
-        {
-            Text.text = $"帧数：{Frame}";
-            time = 0;
-            Frame = 0;
-        }
-    }
     private void Event_ChoiseGroupByPic(object[] values) //图片区域长按选择一个组
     {
         if (clickflag)

Assets/scripts/common/mainGameView.cs

@@ -1827,12 +1827,7 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
         string bindynamiclocalpath = Application.persistentDataPath + $"/MyPic/{key}/{key}_dynamic.bin";
         DynamicData dynamic = getdynamicdata(key);
 
-        System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();
-        sw.Start();
         item.Init(key, png, jpg, jsondata, dynamic, map);
-        sw.Start();
-        GroupListManager.Instance.Init_Text.text = $"初始化消耗时间：{sw.ElapsedMilliseconds}";
-
     }
 
 

Assets/scripts/perfabItems/RawImageWaterWave.cs

@@ -35,6 +35,8 @@ public class RawImageWaterWave : MonoBehaviour
         pixelsBaseArr = showTexture.GetPixels32();
         //变化像素点
         pixelsDrawArr = new Color32[pixelsBaseArr.Length];
+
+        Wave();
     }
 
     void Update()

Assets/scripts/perfabItems/colorItem.cs

@@ -85,9 +85,13 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
         IsSelect = false;
         targetProgress = Jindu;
         NowProgress = Jindu;
+        nowvalue = Jindu;
         UseColor = color;
         GID = groupid;
         IdName = groupid.ToString();
+
+        Jindu_NotWave.fillAmount = Jindu;
+        JIndu_Wave.heightPercent = Jindu;
     }
 
     public void ChangeProgress(float jindu)
@@ -261,7 +265,12 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
     {
         yield return null;
         if (IsSelect)
-            transform.DOScale(SelectScale, 0.2f);
+        {
+            transform.DOScale(SelectAniScale, 0.2f).SetEase(Ease.OutSine).onComplete = () =>
+            {
+                transform.DOScale(Vector3.one * SelectScale, 0.1f);
+            };
+        }
         else
             transform.DOScale(NotSelectScale, 0.2f);
     }