更新代码，更改保存文件的命名

Assets/Editor/GameEditor.cs

@@ -16,6 +16,7 @@ public class ResData
     public Texture2D png = null;
     public Sprite jpg = null;
     public ResJsonData json = null;
+    public DynamicData dynamic = new DynamicData();
 }
 
 public class GameEditor
@@ -58,6 +59,12 @@ public class GameEditor
         BinaryFormatter saveBf = new BinaryFormatter();
         saveBf.Serialize(saveFs, rd.json);
         saveFs.Close();
+
+        string saveDynamicPath = AssetDatabase.GetAssetPath(Selection.activeInstanceID) + "/" + rd.name + "_dynamic.bin";
+        FileStream saveDynamicFs = File.Open(saveDynamicPath, FileMode.Create);
+        BinaryFormatter saveDynamicBf = new BinaryFormatter();
+        saveDynamicBf.Serialize(saveDynamicFs, rd.dynamic);
+        saveDynamicFs.Close();
         Debug.Log("成功：" + savePath);
     }
     public static void FunDo(short[] l, Texture2D png, RoomDatas rd)

Assets/GameMgr/GameMgr.cs

@@ -18,10 +18,10 @@ public class GameMgr : MonoBehaviour
     public EffectItemMgr eiMgr;
 
     public Texture2D gray;
-    public void Init(string key, Texture2D png, Sprite jpg, ResJsonData json)
+    public void Init(string key, Texture2D png, Sprite jpg, ResJsonData json, DynamicData dynamic)
     {
         ins = this;
-        md.Init(key, png, jpg, json);
+        md.Init(key, png, jpg, json, dynamic);
         GetComponent<RectTransform>().offsetMax = Vector2.zero;
         GetComponent<RectTransform>().offsetMin = Vector2.zero;
     }
@@ -169,7 +169,7 @@ public class GameMgr : MonoBehaviour
     public void Clear()
     {
         md.Clear();
-        md.Init(md.key, md.png, md.jpg, md.json);
+        md.Init(md.key, md.png, md.jpg, md.json, md.dynamic);
     }
     public void RePlay()
     {
@@ -194,12 +194,12 @@ public class GameMgr : MonoBehaviour
             curTime -= maxTime;
             for (int i = 0; i < md.json.roomDatas.Count; i++)
             {
-                if (md.json.roomDatas[i].id == md.json.step[stepIndex])
+                if (md.json.roomDatas[i].id == md.dynamic.step[stepIndex])
                 {
                     Vector2 v = new Vector2(md.json.roomDatas[i].px, md.json.roomDatas[i].py);
                     miMgr.Play(v, md.json.roomDatas[i].id);
                     stepIndex++;
-                    if (stepIndex >= md.json.step.Count)
+                    if (stepIndex >= md.dynamic.step.Count)
                     {
                         stepIndex = -1;
                     }

Assets/GameMgr/MainData.cs

@@ -18,6 +18,7 @@ public class MainData : MonoBehaviour
     public Texture2D png = null;
     public Sprite jpg = null;
     public ResJsonData json;
+    public DynamicData dynamic;
 
     public Image imgpng;
     public Image imgjpg;
@@ -25,13 +26,14 @@ public class MainData : MonoBehaviour
     public RectTransform rect;
     public int curGroupId = -1;
 
-    public void Init(string _key, Texture2D _png, Sprite _jpg, ResJsonData _json)
+    public void Init(string _key, Texture2D _png, Sprite _jpg, ResJsonData _json, DynamicData _dynamic)
     {
         ChooseGroup();
         key = _key;
         png = _png;
         jpg = _jpg;
         json = _json;
+        dynamic = _dynamic;
         imgpng.sprite = Sprite.Create(png, new Rect(0, 0, png.width, png.height), new Vector2(0.5f, 0.5f));
         imgpng.GetComponent<RectTransform>().sizeDelta = new Vector2(png.width, png.height);
         imgjpg.sprite = jpg;
@@ -45,7 +47,7 @@ public class MainData : MonoBehaviour
         GameMgr.Ins.tiMgr.Init(json, png);
         GameMgr.Ins.tiMgr.SizeChange(s, true);
 
-        EventDispatcher.Dispatch(EventName.Event.Event_GroupListCreate, json.roomGroupsData);
+        EventDispatcher.Dispatch(EventName.Event.Event_GroupListCreate, json.roomGroupsData, dynamic);
     }
 
 
@@ -88,8 +90,7 @@ public class MainData : MonoBehaviour
                 {
                     ExRoomDatas erd = new ExRoomDatas();
                     rgd.roomIds.Remove(id);
-                    rgd.roomIdsOver.Add(id);
-                    json.step.Add(id);
+                    dynamic.AddData(rgd.id, id);
                     Color[] c_png = png.GetPixels();
                     for (int j = 0; j < json.allPos.Count; j++)
                     {
@@ -104,8 +105,8 @@ public class MainData : MonoBehaviour
                     GameMgr.Ins.eiMgr.Create(new Color(rgd.R / 255f, rgd.G / 255f, rgd.B / 255f, 1), v);
                     GameMgr.Ins.tiMgr.CircleId(id);
                     GameMgr.Ins.miMgr.Play(v, id);
-                    EventDispatcher.Dispatch(EventName.Event.Event_GropuItemChange, json.roomGroupsData[i]);
-                    //SaveManager.Instance.SaveRes(key, json, png);
+                    EventDispatcher.Dispatch(EventName.Event.Event_GropuItemChange, json.roomGroupsData[i], dynamic);
+                    SaveManager.Instance.SaveRes(key, dynamic, png);
                     return true;
                 }
             }
@@ -187,12 +188,7 @@ public class MainData : MonoBehaviour
 
     public void Clear()
     {
-        for (int i = 0; i < json.roomGroupsData.Count; i++)
-        {
-            json.roomGroupsData[i].roomIds.AddRange(json.roomGroupsData[i].roomIdsOver);
-            json.roomGroupsData[i].roomIdsOver.Clear();
-        }
-        json.step.Clear();
+        dynamic = new DynamicData();
         Color[] c = png.GetPixels();
         for (int i = 0; i < c.Length; i++)
         {
@@ -203,15 +199,15 @@ public class MainData : MonoBehaviour
         }
         png.SetPixels(c);
         png.Apply();
-        SaveManager.Instance.SaveRes(key, json, png);
+        SaveManager.Instance.SaveRes(key, dynamic, png);
     }
     public void RePlay()
     {
         ChooseGroup();
         Dictionary<int, ExRoomDatas> dic = new Dictionary<int, ExRoomDatas>();
-        for (int i = 0; i < json.step.Count; i++)
+        for (int i = 0; i < dynamic.step.Count; i++)
         {
-            dic.Add(json.step[i], new ExRoomDatas());
+            dic.Add(dynamic.step[i], new ExRoomDatas());
         }
         for (int i = 0; i < json.allPos.Count; i++)
         {
@@ -220,9 +216,9 @@ public class MainData : MonoBehaviour
                 dic[json.allPos[i]].AddData(i, png.width);
             }
         }
-        for (int i = 0; i < json.step.Count; i++)
+        for (int i = 0; i < dynamic.step.Count; i++)
         {
-            GameMgr.Ins.miMgr.Create(this, dic[json.step[i]], json.step[i]);
+            GameMgr.Ins.miMgr.Create(this, dic[dynamic.step[i]], dynamic.step[i]);
         }
     }
 }
\ No newline at end of file

Assets/GameMgr/ResJsonData.cs

@@ -5,11 +5,58 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using UnityEngine;
+[Serializable]
+public class DynamicData
+{
+    public List<int> step = new List<int>();
+    public List<DynamicGroupsData> dynamicGroupsData = new List<DynamicGroupsData>();
+
+    public void AddData(int groupId, int roomIds)
+    {
+        if (step.Contains(roomIds))
+        {
+            Debug.LogError("重复记录roomIds：" + roomIds);
+            return;
+        }
+        step.Add(roomIds);
+        for (int i = 0; i < dynamicGroupsData.Count; i++)
+        {
+            if (dynamicGroupsData[i].id == groupId)
+            {
+                dynamicGroupsData[i].roomIds.Add(roomIds);
+                return;
+            }
+        }
+        DynamicGroupsData dgd = new DynamicGroupsData();
+        dgd.id = groupId;
+        dgd.roomIds.Add(roomIds);
+        dynamicGroupsData.Add(dgd);
+    }
+
+    public int GetCountById(int groupId)
+    {
+        for (int i = 0; i < dynamicGroupsData.Count; i++)
+        {
+            if (dynamicGroupsData[i].id == groupId)
+            {
+                return dynamicGroupsData[i].roomIds.Count;
+            }
+        }
+        return 0;
+    }
+}
+
+[Serializable]
+public class DynamicGroupsData
+{
+    public int id;
+    public List<int> roomIds = new List<int>();
+}
+
 
 [Serializable]
 public class ResJsonData
 {
-    public List<int> step = new List<int>();
 
     public List<short> allPos = new List<short>();
 
@@ -61,7 +108,6 @@ public class RoomDatas
 public class RoomGroupsData
 {
     public int id;
-    public List<int> roomIdsOver = new List<int>();
     public List<int> roomIds = new List<int>();
     public int R;
     public int G;
@@ -96,7 +142,7 @@ public class ExRoomDatas
 
     public void AddData(int index, int width)
     {
-        int x = index%width;
+        int x = index % width;
         int y = index / width;
         V2 v = new V2(x, y);
         if (size.x == -1 || size.x > v.x)

Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ.bin.meta → Assets/Resources/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ_dynamic.bin.meta

 fileFormatVersion: 2
-guid: 7ee95e13e87432841a975e939f670522
+guid: 9730bf19ac9294040a07a79226549223
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Resources/cc2D9Z2w9k0evqUiCQ/png.png.meta

-fileFormatVersion: 2
-guid: 06041cd5648518c499649c85181dccab
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 1
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 1
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/perfabs/GameMgr.prefab

@@ -5421,7 +5421,6 @@ MonoBehaviour:
   png: {fileID: 0}
   jpg: {fileID: 0}
   json:
-    step: 
     allPos: 
     roomDatas: []
     roomGroupsData: []
@@ -5443,6 +5442,9 @@ MonoBehaviour:
     extraMetaData:
       kadian_size: 0
       tuhei_size: 0
+  dynamic:
+    step: 
+    dynamicGroupsData: []
   imgpng: {fileID: 7126587409335573646}
   imgjpg: {fileID: 2338271980406512720}
   rect: {fileID: 136994829194703267}

Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ.json.meta → Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ_dynamic.bin.meta

 fileFormatVersion: 2
-guid: e927c749bfe817144b7d50905df2cbc0
-TextScriptImporter:
+guid: 9eeacb58f211e3d40b24a27ac50f1e90
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ_jpg.jpg.meta

+fileFormatVersion: 2
+guid: 1ba6afe7cfe36de47842e3ffc30acaad
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ_json.bin.meta

+fileFormatVersion: 2
+guid: d7720341b0946e14098d119bdc0706d4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ_png.png.meta

+fileFormatVersion: 2
+guid: f7ff01238c0c6b241b95d7edfa79b9e6
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ_preview.png.meta

+fileFormatVersion: 2
+guid: 2d3e4429c1ce0e54eaaf7c5fe1e95aae
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ/jpg.jpg.meta

-fileFormatVersion: 2
-guid: cf66d882f1b15b64d9be178a311b9657
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 1
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 1
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ/png.png.meta

-fileFormatVersion: 2
-guid: c3d5506426d4db6429b34099c35001a2
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 1
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 1
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/cc2D9Z2w9k0evqUiCQ/pngSave.png.meta

-fileFormatVersion: 2
-guid: c16ead685cea1e44aab55a0871b83153
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 1
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 1
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/scripts/Views/gameScene/gameSceneLogic.cs

@@ -48,6 +48,8 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
     Dictionary<string, EventChildItemBack> childEventHandlers = new Dictionary<string, EventChildItemBack>();
 
     private float ChildSize;
+
+    private string CurPicName = "";
     void onEvent(string name, EventChildItemBack func)
     {
         utilsTools.onEvent(this, name);

Assets/scripts/Views/maingame/GroupListManager.cs

@@ -7,12 +7,12 @@ using UnityEngine.UI;
 using System.Linq;
 using DG.Tweening;
 using TMPro;
-using static UnityEditor.Progress;
+using UnityEditor.ShaderGraph;
 
 public class GroupListManager : MonoBehaviour
 {
     private static GroupListManager instance;
-    public static GroupListManager Instance=>instance;
+    public static GroupListManager Instance => instance;
 
     public ScrollRect scrollview; //列表
     public GameObject GroupItem_Obj; //要实例化的预制体
@@ -21,10 +21,10 @@ public class GroupListManager : MonoBehaviour
     public GameObject TipTitle; //提示文本
     public Slider AllProcress; //總的進度
     public TextMeshProUGUI AllProcress_Text; //百分比進度
-    private List<colorItem> AllItem = new List<colorItem>();
 
     private float AllAreaCount;
     private float ClickAreaCount;
+    private List<colorItem> AllItem = new List<colorItem>();
 
     private int Frame;
     private float time;
@@ -99,14 +99,15 @@ public class GroupListManager : MonoBehaviour
     private void GroupItemChange(object[] values)
     {
         RoomGroupsData data = (RoomGroupsData)values[0];
-        float Jindu = (float)data.roomIdsOver.Count/((float)data.roomIds.Count+ (float)data.roomIdsOver.Count);
+        DynamicData dynamic = (DynamicData)values[1];
+        float Jindu = (float)dynamic.GetCountById(data.id) / data.roomIds.Count;
         var item = AllItem.FirstOrDefault((a) => { return a.GID == data.id; });
+
+        float value = dynamic.GetCountById(data.id) - item.ClickAreaCount;
+        item.ClickAreaCount = dynamic.GetCountById(data.id);
+        ClickAreaCount = ClickAreaCount + value;
         if (item != null)
         {
-            float value = data.roomIdsOver.Count - item.ClickAreaCount;
-            item.ClickAreaCount = data.roomIdsOver.Count;
-            ClickAreaCount = ClickAreaCount + value;
-
             item.ChangeProgress(Jindu);
             if (Jindu >= 1)
             {
@@ -125,13 +126,13 @@ public class GroupListManager : MonoBehaviour
         SetTotalProcress();
     }
 
-
     private void SetTotalProcress()
     {
         float value = ClickAreaCount / AllAreaCount;
         AllProcress.value = value;
         AllProcress_Text.text = value.ToString("P0");
     }
+
     private void RemoveAGroup(colorItem removeitem)
     {
         AllItem.Remove(removeitem);
@@ -193,6 +194,7 @@ public class GroupListManager : MonoBehaviour
         ClickAreaCount = 0;
 
         List<RoomGroupsData> roomGroupsData = (List<RoomGroupsData>)values[0];
+        DynamicData dynamic = (DynamicData)values[1];
         int AllGroupNum = roomGroupsData.Count;  //总的组个数
         float NowJindu = 0f;  //现在的进度
         Transform tran;
@@ -208,14 +210,15 @@ public class GroupListManager : MonoBehaviour
         {
             foreach (var item in roomGroupsData)
             {
-                NowJindu = (float)item.roomIdsOver.Count / (item.roomIds.Count + item.roomIdsOver.Count);
+                NowJindu = (float)dynamic.GetCountById(item.id) / item.roomIds.Count;
+
+                AllAreaCount = AllAreaCount + item.roomIds.Count + dynamic.GetCountById(item.id);
+                ClickAreaCount = ClickAreaCount + dynamic.GetCountById(item.id);
 
-                AllAreaCount = AllAreaCount + item.roomIds.Count + item.roomIdsOver.Count;
-                ClickAreaCount = ClickAreaCount + item.roomIdsOver.Count;
                 if (NowJindu >= 1)
                     continue;
                 tran = Content.transform.GetChild(index);
-                var coloritem = InitItem(tran, item, NowJindu, item.id);
+                var coloritem = InitItem(tran, item, dynamic.GetCountById(item.id), dynamic.GetCountById(item.id) + item.roomIds.Count);
                 coloritem.index = index;
                 index++;
                 AllItem.Add(coloritem);
@@ -226,13 +229,13 @@ public class GroupListManager : MonoBehaviour
             for (int i = 0; i < childCount; i++)
             {
                 var item = roomGroupsData[index];
-                NowJindu = (float)item.roomIdsOver.Count / (item.roomIds.Count + item.roomIdsOver.Count);
-                AllAreaCount = AllAreaCount + item.roomIds.Count + item.roomIdsOver.Count;
-                ClickAreaCount = ClickAreaCount + item.roomIdsOver.Count;
+                NowJindu = (float)dynamic.GetCountById(item.id) / item.roomIds.Count;
+                AllAreaCount = AllAreaCount + item.roomIds.Count + dynamic.GetCountById(item.id);
+                ClickAreaCount = ClickAreaCount + dynamic.GetCountById(item.id);
                 if (NowJindu >= 1)
                     continue;
                 tran = Content.transform.GetChild(index);
-                var coloritem = InitItem(tran, item, NowJindu, item.id);
+                var coloritem = InitItem(tran, item, dynamic.GetCountById(item.id), dynamic.GetCountById(item.id) + item.roomIds.Count);
                 coloritem.index = index;
                 index++;
                 AllItem.Add(coloritem);
@@ -242,18 +245,18 @@ public class GroupListManager : MonoBehaviour
             for (int i = 0; i < AllGroupNum; i++)
             {
                 var item = roomGroupsData[index];
-                NowJindu = (float)item.roomIdsOver.Count / (item.roomIds.Count + item.roomIdsOver.Count);
-                AllAreaCount = AllAreaCount + item.roomIds.Count + item.roomIdsOver.Count;
-                ClickAreaCount = ClickAreaCount + item.roomIdsOver.Count;
+                NowJindu = (float)dynamic.GetCountById(item.id) / item.roomIds.Count;
+                AllAreaCount = AllAreaCount + item.roomIds.Count + dynamic.GetCountById(item.id);
+                ClickAreaCount = ClickAreaCount + dynamic.GetCountById(item.id);
                 if (NowJindu >= 1)
                     continue;
 
                 tran = GameObject.Instantiate(GroupItem_Obj).transform;
-                var coloritem = InitItem(tran, item, NowJindu, item.id);
+                var coloritem = InitItem(tran, item, dynamic.GetCountById(item.id), dynamic.GetCountById(item.id)+ item.roomIds.Count);
                 coloritem.index = index;
                 index++;
                 AllItem.Add(coloritem);
-            }      
+            }
         }
 
         EventDispatcher.Dispatch(EventName.Event.Event_LoadingPanelCLose);
@@ -271,7 +274,7 @@ public class GroupListManager : MonoBehaviour
             item.PlayInitAni();
         }
     }
-    private colorItem InitItem(Transform tran, RoomGroupsData GroupData , float Jindu,int gid)
+    private colorItem InitItem(Transform tran, RoomGroupsData groupdata, float clickCount, float allCount)
     {
         tran.SetParent(Content.transform);
         tran.localPosition = Vector3.zero;
@@ -280,17 +283,19 @@ public class GroupListManager : MonoBehaviour
         tran.gameObject.SetActive(true);
 
         var coloritem = tran.GetComponent<colorItem>();
-        coloritem.Init(new Color(GroupData.R, GroupData.G, GroupData.B) / 255f, Jindu, gid);
-        coloritem.GroupData = GroupData;
-        coloritem.ClickAreaCount = GroupData.roomIdsOver.Count;
-        coloritem.AllAreaCount = GroupData.roomIds.Count + GroupData.roomIdsOver.Count;
+        coloritem.Init(new Color(groupdata.R, groupdata.G, groupdata.B) / 255f, clickCount/allCount, groupdata.id);
+
+        coloritem.GroupData = groupdata;
+        coloritem.ClickAreaCount = clickCount;
+        coloritem.AllAreaCount = allCount;
+
         return coloritem;
     }
 
     private int nowidx = 0;
     private int oldindex = 0;
     private float ChildSize = 0;
-    public void ClickItem(int Gid,int clickindex)
+    public void ClickItem(int Gid, int clickindex)
     {
         ChangeTipTitleState(false);
         Vector3 clickpos = Vector3.zero;

Assets/scripts/utils/SaveManager.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Net.NetworkInformation;
+using UnityEngine.TextCore.Text;
 
 public class SaveManager : MonoBehaviour
 {
@@ -44,19 +45,54 @@ public class SaveManager : MonoBehaviour
         }
     }
 
-    public void SaveRes(string key, ResJsonData data,Texture2D png)
+    private void Update()
+    {
+        if (Input.GetKeyDown(KeyCode.A))
+        {
+            StartCoroutine(Test());
+        }
+    }
+
+    IEnumerator Test()
+    {
+        string path = Application.streamingAssetsPath + "/cc2D9Z2w9k0evqUiCQ/cc2D9Z2w9k0evqUiCQ.bin";
+
+#if UNITY_ANDROID
+        path = "file://" + path;
+#endif
+        WWW www = new WWW(path);
+
+        yield return www;
+        string str = www.text;
+        
+
+        MemoryStream stream = new MemoryStream(www.bytes);
+        //二进制反序列化
+        BinaryFormatter bf = new BinaryFormatter();
+        ResJsonData test = (ResJsonData)bf.Deserialize(stream);
+        Debug.Log("test" + test.allPos.Count + " name=" + test.height);
+    }
+    public void SaveRes(string key, DynamicData data, Texture2D png)
     {
         SavePng(key, png);
         SaveBin(key, data);
     }
+    public void SaveJson(string key, ResJsonData json)
+    {
+        string path = SavePath + $"{key}/{key}_json.bin";
+        FileStream fs = new FileStream(path, FileMode.OpenOrCreate, FileAccess.Write);
+        BinaryFormatter saveBf = new BinaryFormatter();
+        saveBf.Serialize(fs, json);
+        fs.Close();
+    }
 
-    public void SaveBin(string key,ResJsonData data)
+    public void SaveBin(string key, DynamicData data)
     {
         savefiles.Add(key);
         StartCoroutine(SaveBing(key, data));
     }
 
-    IEnumerator SaveBing(string key, ResJsonData data)
+    IEnumerator SaveBing(string key, DynamicData data)
     {
         yield return null;
 
@@ -69,10 +105,10 @@ public class SaveManager : MonoBehaviour
     /// </summary>
     /// <param name="path"></param>
     /// <param name="json"></param>
-    public void SaveBin_Ie(string key, ResJsonData data)
+    public void SaveBin_Ie(string key, DynamicData data)
     {
         CreateDirectory(SavePath + $"{key}");
-        string path = SavePath + $"{key}/{key}.bin";
+        string path = SavePath + $"{key}/{key}_dynamic.bin";
         FileStream fs = new FileStream(path, FileMode.OpenOrCreate, FileAccess.Write);
         BinaryFormatter saveBf = new BinaryFormatter();
         saveBf.Serialize(fs, data);
@@ -88,14 +124,14 @@ public class SaveManager : MonoBehaviour
     {
         savefiles.Add(key);
         CreateDirectory(SavePath + $"{key}");
-        string path = SavePath + $"{key}/{key}.png";
+        string path = SavePath + $"{key}/{key}_png.png";
         StartCoroutine(SavePic(path, png));
     }
 
     public void SaveJPG(string key, Texture2D jpg)
     {
         savefiles.Add(key);
-        string path = SavePath + $"{key}/{key}.jpg";
+        string path = SavePath + $"{key}/{key}_jpg.jpg";
         CreateDirectory(SavePath + $"{key}");
 
         StartCoroutine(SavePic(path, jpg));