同步代码

Assets/GameMgr/GameMgr.cs

@@ -173,31 +173,35 @@ public class GameMgr : MonoBehaviour
     }
     public void RePlay()
     {
+        rePlayList = md.json.step;
         md.RePlay();
-        rePlayIndex = 0;
     }
 
-    public int rePlayIndex = -1;
-
+    public List<int> rePlayList = new List<int>();
+    public float maxTime = 1;
+    public float curTime = 0;
     public void Play()
     {
-        if (rePlayIndex == -1)
+        if (rePlayList.Count == 0)
         {
             return;
         }
+        curTime += Time.deltaTime;
+        if (curTime >= maxTime)
+        {
+            curTime -= maxTime;
             for (int i = 0; i < md.json.roomDatas.Count; i++)
             {
-            if (md.json.roomDatas[i].id == md.json.step[rePlayIndex])
+                if (md.json.roomDatas[i].id == rePlayList[0])
                 {
+                    Debug.Log("进入：" + rePlayList[0] + "_rePlayList.Count=" + rePlayList.Count);
                     Vector2 v = new Vector2(md.json.roomDatas[i].px, md.json.roomDatas[i].py);
+                    Debug.Log("模拟点击：" + v);
                     md.OnClickPos(v);
-                rePlayIndex++;
-                if (rePlayIndex >= md.json.step.Count)
-                {
-                    rePlayIndex = -1;
-                }
+                    rePlayList.RemoveAt(0);
                     break;
                 }
             }
         }
+    }
 }

Assets/GameMgr/MainData.cs

@@ -26,6 +26,7 @@ public class MainData : MonoBehaviour
 
     public void Init(string _key, Texture2D _png, Sprite _jpg, ResJsonData _json)
     {
+        ChooseGroup();
         key = _key;
         png = _png;
         jpg = _jpg;
@@ -111,8 +112,13 @@ public class MainData : MonoBehaviour
         return false;
     }
 
-    public void ChooseGroup(int id)
+    public void ChooseGroup(int id = -1)
     {
+        if (id == -1)
+        {
+            curGroupId = id;
+            GameMgr.Ins.giMgr.CircleAll();
+        }
         Debug.Log("选中组：" + id);
         if (curGroupId == id)
         {
@@ -203,6 +209,7 @@ public class MainData : MonoBehaviour
             json.roomGroupsData[i].roomIds.AddRange(json.roomGroupsData[i].roomIdsOver);
             json.roomGroupsData[i].roomIdsOver.Clear();
         }
+        json.step = new List<int>();
         Color[] c = png.GetPixels();
         for (int i = 0; i < c.Length; i++)
         {
@@ -213,5 +220,8 @@ public class MainData : MonoBehaviour
         }
         png.SetPixels(c);
         png.Apply();
+        ChooseGroup();
+        GameMgr.Ins.tiMgr.Init(json, png);
+        GameMgr.Ins.tiMgr.SizeChange(transform.parent.localScale.x);
     }
 }
\ No newline at end of file

Assets/Scenes/gameScene.unity

@@ -1416,7 +1416,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: 427, y: -82.500015}
+  m_AnchoredPosition: {x: 427, y: -82.5}
   m_SizeDelta: {x: 87, y: 91}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &824212554
@@ -2350,6 +2350,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1555736098}
   m_CullTransparentMesh: 1
+--- !u!1 &1591818771
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1591818772}
+  - component: {fileID: 1591818774}
+  - component: {fileID: 1591818773}
+  m_Layer: 5
+  m_Name: fore
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1591818772
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1591818771}
+  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: 1915058719}
+  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: 55, y: 55}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1591818773
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1591818771}
+  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: 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_Sprite: {fileID: 21300000, guid: e1a95739d26188848a55124e61f7538f, type: 3}
+  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 &1591818774
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1591818771}
+  m_CullTransparentMesh: 1
 --- !u!224 &1607487023 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6616910588763818716, guid: d22d30a8bc14c794682266b9e458c412, type: 3}
@@ -2511,6 +2587,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1643100473}
   m_CullTransparentMesh: 1
+--- !u!1 &1728218163
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1728218164}
+  - component: {fileID: 1728218166}
+  - component: {fileID: 1728218165}
+  m_Layer: 5
+  m_Name: fore
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1728218164
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1728218163}
+  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: 1904010687}
+  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: 55, y: 55}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1728218165
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1728218163}
+  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: 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_Sprite: {fileID: 21300000, guid: b42c4b754bf4ff34d9602087cdab6bf8, type: 3}
+  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 &1728218166
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1728218163}
+  m_CullTransparentMesh: 1
 --- !u!1 &1778506297
 GameObject:
   m_ObjectHideFlags: 0
@@ -2909,6 +3061,274 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -484.2}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1904010686
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1904010687}
+  - component: {fileID: 1904010690}
+  - component: {fileID: 1904010689}
+  - component: {fileID: 1904010688}
+  m_Layer: 5
+  m_Name: Clear
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1904010687
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1904010686}
+  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: 1728218164}
+  m_Father: {fileID: 3055440550137239661}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 215, y: -120}
+  m_SizeDelta: {x: 87, y: 91}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1904010688
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1904010686}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1904010689}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 9106039126864166767}
+        m_TargetAssemblyTypeName: GroupListManager, Assembly-CSharp
+        m_MethodName: Test_Btn
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 1
+--- !u!114 &1904010689
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1904010686}
+  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: 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_Sprite: {fileID: 21300000, guid: c24d2a60900d07146b57d3a3082bb957, type: 3}
+  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 &1904010690
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1904010686}
+  m_CullTransparentMesh: 1
+--- !u!1 &1915058718
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1915058719}
+  - component: {fileID: 1915058722}
+  - component: {fileID: 1915058721}
+  - component: {fileID: 1915058720}
+  m_Layer: 5
+  m_Name: RePlay
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1915058719
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1915058718}
+  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: 1591818772}
+  m_Father: {fileID: 3055440550137239661}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 315, y: -120}
+  m_SizeDelta: {x: 87, y: 91}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1915058720
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1915058718}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1915058721}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 9106039126864166767}
+        m_TargetAssemblyTypeName: GroupListManager, Assembly-CSharp
+        m_MethodName: Test_Btn_RePlay
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 1
+--- !u!114 &1915058721
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1915058718}
+  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: 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_Sprite: {fileID: 21300000, guid: c24d2a60900d07146b57d3a3082bb957, type: 3}
+  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 &1915058722
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1915058718}
+  m_CullTransparentMesh: 1
 --- !u!1 &1921562643
 GameObject:
   m_ObjectHideFlags: 0
@@ -5486,6 +5906,8 @@ RectTransform:
   - {fileID: 669974489}
   - {fileID: 3394804452262531086}
   - {fileID: 1354215336290540113}
+  - {fileID: 1904010687}
+  - {fileID: 1915058719}
   m_Father: {fileID: 1147557151012020857}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -7322,10 +7744,10 @@ RectTransform:
   m_Father: {fileID: 1147557151012020857}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1274}
+  m_SizeDelta: {x: 0, y: -350}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!1 &7432927552733396289
 GameObject:
@@ -8114,6 +8536,7 @@ MonoBehaviour:
   TipTitle: {fileID: 1539005795910344629}
   AllProcress: {fileID: 1667660345673518993}
   AllProcress_Text: {fileID: 4457589912443491345}
+  idd: 0
 --- !u!114 &9174292048928438190
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/scripts/EventName.cs

@@ -32,6 +32,7 @@ public static class EventName
         public const string Event_GroupListCreate = "Event_GroupListCreate";//加载组的数量
         public const string Event_GropuItemChange = "Event_GropuItemChange";//某个组的进度改变
         public const string Event_GroupItemClick = "Event_GroupItemClick";//点击某一个组
+        public const string Event_ChoiseGroupByPic = "Event_ChoiseGroupByPic";  //图片区域长按选择某一个组
 
         public const string Event_AllGroupOver = "Event_AllGroupOver";//游戏结束，全部组都涂完了
 

Assets/scripts/Views/maingame/GroupListManager.cs

@@ -42,7 +42,30 @@ public class GroupListManager : MonoBehaviour
     {
         EventDispatcher.RegisterEvent(EventName.Event.Event_GroupListCreate, CreateGroup, flag);
         EventDispatcher.RegisterEvent(EventName.Event.Event_GropuItemChange, GroupItemChange, flag);
+        EventDispatcher.RegisterEvent(EventName.Event.Event_ChoiseGroupByPic, Event_ChoiseGroupByPic, flag);
     }
+
+    public int idd=5;
+    private void Update()
+    {
+        if (Input.GetKeyDown(KeyCode.A))
+        {
+            EventDispatcher.Dispatch(EventName.Event.Event_ChoiseGroupByPic, idd);
+        }
+    }
+    private void Event_ChoiseGroupByPic(object[] values) //图片区域长按选择一个组
+    {
+        int Gid = (int)values[0];
+
+        var item = AllItem.FirstOrDefault((a) => a.GID == Gid);
+        float childsize = item.GetComponent<RectTransform>().sizeDelta.x;
+        if (item != null)
+        {
+            float targetpos = childsize * item.index - scrollview.flexibleWidth;
+            //Content.transform.DOLocalMoveX();
+        }
+    }
+
     public void ChangeTipTitleState(bool flag)
     {
         TipTitle.SetActive(flag);
@@ -254,4 +277,9 @@ public class GroupListManager : MonoBehaviour
     {
         GameMgr.Ins.Clear();
     }
+
+    public void Test_Btn_RePlay()
+    {
+        GameMgr.Ins.RePlay();
+    }
 }

Assets/scripts/common/mainGameView.cs

@@ -1796,8 +1796,10 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
         Texture2D jpg_texture = null;
         string pngpath = dirpath+$"{name}.png";
         UnityWebRequest request;
+        bool localflag = false;
         if (File.Exists(pngpath))
         {
+            localflag = true;
             request = UnityWebRequestTexture.GetTexture(pngpath);
             yield return request.SendWebRequest();
             if (request.isDone)
@@ -1823,17 +1825,45 @@ public class mainGameView : MonoBehaviour //大图的处理、具体的玩法
         else
         {
             jpg_texture = Resources.Load<Texture2D>("cc2D9Z2w9k0evqUiCQ/jpg");
-            jpg = Sprite.Create(jpg_texture, new Rect(0, 0, jpg_texture.width, jpg_texture.height), new Vector2(0.5f, 0.5f));
+            //jpg = Sprite.Create(jpg_texture, new Rect(0, 0, jpg_texture.width, jpg_texture.height), new Vector2(0.5f, 0.5f));
 
         }
 
         var jsondata = getdata("cc2D9Z2w9k0evqUiCQ");
 
+
+        if (localflag) //加载本地的到这里就回去了，下面是第一次
+        {
             item.GetComponent<GameMgr>().Init("cc2D9Z2w9k0evqUiCQ", png, jpg, jsondata);
+            yield break;
+        }
+
+
         SaveManager.Instance.SaveRes("cc2D9Z2w9k0evqUiCQ", jsondata, png);
-        yield return new WaitForSeconds(0.5f);
         SaveManager.Instance.SaveJPG("cc2D9Z2w9k0evqUiCQ", item.GetComponent<GameMgr>().md.jpg.texture);
+
+        while (!SaveManager.Instance.IsSaveOver)
+        {
+            yield return null;
         }
+        request = UnityWebRequestTexture.GetTexture(pngpath);
+        yield return request.SendWebRequest();
+        if (request.isDone)
+        {
+            png = DownloadHandlerTexture.GetContent(request);
+        }
+        request = UnityWebRequestTexture.GetTexture(jpgpath);
+        yield return request.SendWebRequest();
+        if (request.isDone)
+        {
+            jpg_texture = DownloadHandlerTexture.GetContent(request);
+            jpg = Sprite.Create(jpg_texture, new Rect(0, 0, jpg_texture.width, jpg_texture.height), new Vector2(0.5f, 0.5f));
+        }
+
+        jsondata = getdata("cc2D9Z2w9k0evqUiCQ");
+        item.GetComponent<GameMgr>().Init("cc2D9Z2w9k0evqUiCQ", png, jpg, jsondata);
+    }
+
 
     private ResJsonData getdata(string name)
     {

Assets/scripts/utils/SaveManager.cs

@@ -21,6 +21,17 @@ public class SaveManager : MonoBehaviour
         }
         set { savepath = value; }
     }
+
+    //是否保存结束
+    public bool IsSaveOver
+    {
+        get
+        {
+            return savefiles.Count == 0;
+        }
+    }
+
+    private List<string> savefiles= new List<string>();
     private void Awake()
     {
         instance = this;
@@ -41,6 +52,7 @@ public class SaveManager : MonoBehaviour
 
     public void SaveBin(string key,ResJsonData data)
     {
+        savefiles.Add(key);
         StartCoroutine(SaveBing(key, data));
     }
 
@@ -49,6 +61,8 @@ public class SaveManager : MonoBehaviour
         yield return null;
 
         SaveBin_Ie(key, data);
+        if (savefiles.Count > 0)
+            savefiles.RemoveAt(0);
     }
     /// <summary>
     /// 保存bin文件
@@ -72,27 +86,19 @@ public class SaveManager : MonoBehaviour
     /// <param name="png"></param>
     public void SavePng(string key, Texture2D png)
     {
+        savefiles.Add(key);
         CreateDirectory(SavePath + $"{key}");
         string path = SavePath + $"{key}/{key}.png";
         StartCoroutine(SavePic(path, png));
-        //byte[] dataBytes = png.EncodeToPNG();
-        //FileStream fs = File.Open(path, FileMode.OpenOrCreate);
-        //fs.Write(dataBytes, 0, dataBytes.Length);
-        //fs.Flush();
-        //fs.Close();
     }
 
     public void SaveJPG(string key, Texture2D jpg)
     {
+        savefiles.Add(key);
         string path = SavePath + $"{key}/{key}.jpg";
         CreateDirectory(SavePath + $"{key}");
 
         StartCoroutine(SavePic(path, jpg));
-        //byte[] dataBytes = png.EncodeToPNG();
-        //FileStream fs = File.Open(path, FileMode.OpenOrCreate);
-        //fs.Write(dataBytes, 0, dataBytes.Length);
-        //fs.Flush();
-        //fs.Close();
     }
 
     IEnumerator SavePic(string path,Texture2D pic)
@@ -103,6 +109,8 @@ public class SaveManager : MonoBehaviour
         fs.Write(dataBytes, 0, dataBytes.Length);
         fs.Flush();
         fs.Close();
+        if(savefiles.Count>0)
+            savefiles.RemoveAt(0);
     }
 
     private void CreateDirectory(string dirpath)