1

Assets/scripts/Views/gameScene/gameSceneLogic.cs

@@ -572,7 +572,7 @@ public class gameSceneLogic : MonoBehaviour, IEventHandler
             utilsTools.setGDataByKey("NativeTempData", "main");
             SceneManager.LoadScene("Scenes/MainGame");
             return false;
-        }, 35);
+        }, 40);
         
     }
     public void onTestTemp1()

Assets/scripts/Views/gameScene/gameUserInfos.cs

@@ -44,6 +44,7 @@ public class gameUserInfos : MonoBehaviour, IEventHandler
                     if(isSuccess)
                     {
                         HistoryClick historyClick = JsonUtility.FromJson<HistoryClick>(data as string);
+                        if (historyClick == null) return 0;
                         string history = historyClick.getHistory();
                         gameScenUserInfo.setShowAreaids(history);
                         return 0;
@@ -148,8 +149,37 @@ public class gameUserInfos : MonoBehaviour, IEventHandler
             Debug.Log("onCloseScenePrveHandler 2");
             utilsTools.saveGameScenUserInfo(gameScenUserInfo);
             Debug.Log("onCloseScenePrveHandler 3");
+            string nativeParam1 = utilsTools.getGDataByKey<string>("NativeTempData", "");
+            if (nativeParam1.Equals("") == false)
+            {
+                float allAreaSize = (float)utilsTools.getGDataByKey<int>("allAreaSize", 0);
+                float schedule1 = (int)(gameScenUserInfo.areaInfoUseData.Count * 100f / allAreaSize);
+                int schedule = 0;
+                if (schedule1 < 1.00001)
+                {
+                    schedule = 1;
+                }
+                else if (schedule1 > 98.999999991)
+                {
+                    if (utilsTools.getGDataByKey<int>("allAreaSize", 0).Equals(gameScenUserInfo.areaInfoUseData.Count))
+                    {
+                        schedule = 100;
+                    }
+                    else
+                    {
+                        schedule = 99;
+                    }
+                }
+                else
+                {
+                    schedule = (int)schedule1;
+                }
+                nativeParam1 = nativeParam1 + "_" + schedule.ToString();                
+                utilsTools.setGDataByKey("NativeTempData", nativeParam1);
+            }
             updateProgress();
             Debug.Log("onCloseScenePrveHandler 4");
+            
             gameScenUserInfo = null;//直接释放如果期间没有保存，就一起丢失
         }
     }

Assets/scripts/common/mainGameOneImageView.cs

@@ -10,8 +10,10 @@ public class mainGameOneImageView : mainGameView
 {
     // Start is called before the first frame update
     public GameObject oneImg = null;
+    
     private Dictionary<string, Color[]> allColor2 = new Dictionary<string, Color[]>();
     private Dictionary<string, Vector2Short> allColorSize = new Dictionary<string, Vector2Short>();
+    private Color defColor = new Color(1, 1, 1, 1);
     void Start()
     {
     }
@@ -60,12 +62,158 @@ public class mainGameOneImageView : mainGameView
                     else if(value.Equals(fullShow))
                     {
                         int index2 = (int)(x / (float)width  * vector2Short2.x + y / (float)height * vector2Short2.y);
-                        allColor2["outColor"][index] = allColor2["final"][index];
+                        Color color1 = allColor2["final"][index2];
+                        allColor2["outColor"][index] = new Color(color1.r,color1.g,color1.b,1f);
+                    }
+                }
+            }
+        });
+        TaskManages tm =  TaskManages.getInstance();
+        tm.addTask(this, (System.Object[] _) => {
+            onOutColorEndHandler();
+        });
     }
+    public void onOutColorEndHandler()
+    {
+        if(this.gameidJsondata == null)
+        {
+            utilsTools.addTimer_Update(gameObject, "waitJsonInit", (String name) =>
+            {
+                if (this.gameidJsondata == null) return true;
+                onOutColorEndHandler();
+                return false;
+            }, 4);
+            return;
         }
+        checkAddAreaId();
+        checkSelectColors();
     }
+    public void checkSelectColors()
+    {
+        if (allColor2.ContainsKey("select") == false)
+        {
+            utilsTools.addTimer_Update(gameObject, "waitSelectColorInit", (String name) =>
+            {
+                if (allColor2.ContainsKey("select") == false) return true;
+                checkSelectColors();
+                return false;
+            }, 4);
+            return;
+        }
+        //为缩略图准备
+        Vector2Short vector2Short = allColorSize["final"];
+        Vector2Short vector2ShortOut = allColorSize["outColor"];
+        Color[] colors = new Color[vector2Short.x  * vector2Short.y];
+        for (int x = 0;x < vector2Short.x; x++)
+        {
+            float x1 = (float)x;
+            int x2 = (int)(x1 * (float)vector2ShortOut.x / (float)vector2Short.x);
+            for (int y = 0; y < vector2Short.y; y++)
+            {
+                float y1 = (float)y;
+                int index = y * vector2Short.x + x;
+                int y2 = (int)(y1 * (float)vector2ShortOut.y / (float)vector2Short.y);
+                int index2 = y2 * vector2ShortOut.x + x2;
+                colors[index] = colors[index2];
+            }
+        }
+        thumbnailTexture2d = new Texture2D(vector2Short.x, vector2Short.y, TextureFormat.RGBA32, false);
+        allColor2.Add("thumbnail", colors);
+        allColorSize.Add("thumbnail", new Vector2Short(vector2Short.x, vector2Short.y));
+        TaskManages.getInstance().addTask(this, (System.Object[] _) =>
+        {
+            utilsTools.addTimer_Update(gameObject, "applyOut", (String name) =>
+            {
+                Apply();
+                return false;
+            }, 3);
+            nowSelectgid = -1;
+            resetSize();
+            onInitEndHandler();
+
         });
     }
+    public override void showArea(int areaId, OnAreaHandler onAreaHandler = null)
+    {
+        if (areaId == -1)
+        {
+            lineImg.SetActive(false);
+            return;
+        }
+        //显示指定区域
+        if (GroupByAreaPtInfos.mapAllDatas.ContainsKey((short)areaId))
+        {
+            gameAreaItem areaItem1 = gameidJsondata.getAid((short)areaId);
+            List<Vector2Short> areaAllPts = new List<Vector2Short>();
+            Vector2Short size1 = allColorSize["outColor"];
+            Vector2Short size2 = allColorSize["final"];
+            Color color = new Color(1, 1, 1, 0);
+            groupPtInfos_All[areaItem1.gid].getDataByAid(areaItem1.id, ref areaAllPts, true);
+            foreach (var item in areaAllPts)
+            {
+                //lineTexture2d.SetPixel(item.x, item.y, color);//回放使用
+                int idx = item.y * size1.x + item.x;
+                int x =  (int)((float)(item.x * size2.x) / (float)size1.x);
+                int y = (int)((float)(item.y * size2.y) / (float)size1.y);
+                //allColor2["outColor"] = allColor2[]
+            }
+            Apply();
+        }
+        else if (onAreaHandler != null)
+        {
+            onAreaHandler(areaId, false);
+        }
+    }
+    public void Apply()
+    {
+        lineTexture2d.SetPixels(allColor2["outColor"]);
+        lineTexture2d.Apply();
+    }
+    public override void resetSize()
+    {
+        //怎么保持宽高比
+        float width = gameidJsondata.width;
+        float height = gameidJsondata.height;
+        float bet = width / height;
+        RectTransform rectTransform = oneImg.GetComponent<RectTransform>();
+        RectTransform baseTransform = rectTransform.transform.parent.GetComponent<RectTransform>();
+        if (width.Equals(height))
+        {
+            width = utilsTools.DisplaySize.x * 1;
+            height = width;
+        }
+        else
+        {
+            width = utilsTools.DisplaySize.x * 0.65f;
+            height = width * 2;
+        }
+        //确定好宽高后赋值
+        GameObject[] gameObjects = { oneImg,areaIdBase };
+        Vector3 tempPos = rectTransform.localPosition;
+        if (width.Equals(height) == false)
+        {
+            tempPos.y = tempPos.y - 40;
+        }
+        foreach (var item in gameObjects)
+        {
+            if (item == null) continue;
+            var temp = item.GetComponent<RectTransform>();
+            temp.sizeDelta = new Vector2(width, height);
+        }
+        checkAddAreaId();
+        updateScaleView();
+    }
+
+    public override bool getSize(out int width, out int height)
+    {
+        width = -1;
+        height = -1;
+        if (gameidJsondata == null)
+            return false;
+        width = gameidJsondata.width;
+        height = gameidJsondata.height;
+        return true;
+    }
     public override void loadFileInfo(string url, string localpath, int typeId)
     {
 
@@ -90,13 +238,16 @@ public class mainGameOneImageView : mainGameView
                     {
                         allColor2.Add("line",texture2d.GetPixels());
                         allColorSize.Add("line", new Vector2Short((short)texture2d.width, (short)texture2d.height));
+                        Image image = oneImg.GetComponent<Image>(); 
+                        image.sprite = Sprite.Create(texture2d, new Rect(0, 0, texture2d.width, texture2d.height), new Vector2(0.5f, 0.5f));
+                        lineTexture2d = texture2d;
                     }
                     else if(typeId == 2)
                     {
                         allColor2.Add("final", texture2d.GetPixels());
                         allColorSize.Add("final", new Vector2Short((short)texture2d.width, (short)texture2d.height));
                     }
-                    if(allColor2.ContainsKey("line") && allColor2.ContainsKey("select"))
+                    if(allColor2.ContainsKey("line") && allColor2.ContainsKey("final"))
                     {
                         onLineAndSelectBack();
                     }
@@ -161,6 +312,102 @@ public class mainGameOneImageView : mainGameView
             });
         }
     }
+    public override bool switchShowAreaGroup(short gid, OnAreaHandler onAreaHandler = null)
+    {
+        if (gid == nowSelectgid)
+        {
+            if (onAreaHandler != null)
+                onAreaHandler(gid, true);
+            return true;
+        }
+        if (lowImg == null)
+        {
+            if (onAreaHandler != null)
+                onAreaHandler(gid, false);
+            return false;
+        }
+        if (!(digitMatrix != null && lineTexture2d != null && gameidJsondata != null && gameidJsondata.findGid(gid)))
+        {
+            if (onAreaHandler != null)
+                onAreaHandler(gid, false);
+            return false;
+        }
+        Color color = new Color(1, 1, 1, 0);
+        gameAreaGroupItem jsonGroupInfo = null;
+        GroupByAreaPtInfos groupPt = null;
+        List<Vector2Short> tempData = new List<Vector2Short>();
+
+        //if (allColor.ContainsKey("low") == false)
+        //{
+        //    allColor.Add("low", lowImgTexture2d.GetPixels(0, 0, lowImgTexture2d.width, lowImgTexture2d.height));
+        //}
+        //else
+        //{
+        //    allColor["low"] = lowImgTexture2d.GetPixels(0, 0, lowImgTexture2d.width, lowImgTexture2d.height);
+        //}
+        //if (thumbnailTexture2d != null && allColor.ContainsKey("thumbnail") == false)
+        //    allColor.Add("thumbnail", thumbnailTexture2d.GetPixels(0, 0, thumbnailTexture2d.width, thumbnailTexture2d.height));
+
+        if (nowSelectgid > 0)
+        {
+            jsonGroupInfo = gameidJsondata.getRoomGroup(nowSelectgid);
+            groupPt = groupPtInfos[nowSelectgid];
+
+            for (int i = 0; i < jsonGroupInfo.roomIds.Count; i++)
+            {
+                var aid = jsonGroupInfo.roomIds[i];
+                var areamItem = gameidJsondata.getAid(aid);
+                if (areamItem.tempExKey.Equals(""))
+                {
+                    continue;
+                }
+                groupPt.getDataByAid(aid, ref tempData);
+                foreach (var pt in tempData)
+                {
+                    if (digitMatrix.Data[pt.x, pt.y] == bianlun) continue;
+                    color.a = 0f;
+                    allColor2["outColor"][pt.y * gameidJsondata.width + pt.x] = defColor;
+                }
+            }
+        }
+        else
+        {
+            utilsTools.sendEventObjectParams("inGameLoadingValue", 100f, true);
+            utilsTools.setGDataByKey("enableZoomMove", true);
+        }
+        nowSelectgid = gid;
+        jsonGroupInfo = gameidJsondata.getRoomGroup(nowSelectgid);
+        groupPt = groupPtInfos[gid];
+
+        Vector2Short vector2Short = allColorSize["select"];
+        for (int i = 0; i < jsonGroupInfo.roomIds.Count; i++)
+        {
+            var aid = jsonGroupInfo.roomIds[i];
+            var areamItem = gameidJsondata.getAid(aid);
+            if (areamItem.tempExKey.Equals(""))
+            {
+                continue;
+            }
+            groupPt.getDataByAid(aid, ref tempData);
+            foreach (var pt in tempData)
+            {
+                if (digitMatrix.Data[pt.x, pt.y] == bianlun) continue;
+                int x1 = (int)((float)pt.x / (gameidJsondata.width) * (float)vector2Short.x);
+                int y1 = (int)((float)pt.y / (gameidJsondata.height) * (float)vector2Short.y);
+                allColor2["outColor"][pt.y* gameidJsondata.width + pt.x] = allColor2["select"][y1 * vector2Short.x + x1];
+            }
+        }
+        //lowImgTexture2d.SetPixels(0, 0, lowImgTexture2d.width, lowImgTexture2d.height, allColor["low"]);
+        //lowImgTexture2d.Apply();
+        if (onAreaHandler != null)
+            onAreaHandler(gid, true);
+        return true;
+    }
+    protected override void loadSelectImageTexture(Texture2D nowSelectTexture, NotifyEmptParam notify, int width = 0, int height = 0)
+    {
+        allColor2.Add("select", nowSelectTexture.GetPixels());
+        allColorSize.Add("select",new Vector2Short((short)nowSelectTexture.width,(short)nowSelectTexture.height));
+    }
     public override bool loadGameImgId(GameScenUserInfo gameUserInfo)
     {
         string linePath = gameUserInfo.getLineImgLocalPath();
@@ -203,7 +450,6 @@ public class mainGameOneImageView : mainGameView
             float y = 1.0f;
             int a1 = utilsTools.getTotalMillisecond();
             utilsTools.sendEventObjectParams("inGameLoadingValue", 6f, false);
-            Color defColor = new Color(1, 1, 1, 1);
             for (int y1 = 0; y1 < height; y1++)
             {
                 y = y1;
@@ -227,6 +473,7 @@ public class mainGameOneImageView : mainGameView
         loadFileInfo(gameUserInfo.img, linePath, 1);
         utilsTools.setGDataByKey("loadJpg", utilsTools.getTotalMillisecond());
         loadFileInfo(gameUserInfo.finishImg, colorPath, 2);
+        loadSelectImageTextureId(selectTextureIdx);
         return true;
     }
 }

Assets/scripts/common/mainGameView.cs

@@ -38,11 +38,11 @@ public class mainGameView : MonoBehaviour
     private GameScenUserInfo gameScenUseInfo = null;
     //x,y aid 当前帧向量 起点终点 等宽度计算扩散
     private List<AreaAnimationDiffuse> showAreaAnimationDatas = new List<AreaAnimationDiffuse>();
-    private Dictionary<short, GroupByAreaPtInfos> groupPtInfos = new Dictionary<short, GroupByAreaPtInfos>();
-    private Dictionary<short, GroupByAreaPtInfos> groupPtInfos_All = new Dictionary<short, GroupByAreaPtInfos>();//不管是否涂色都会记录
+    protected Dictionary<short, GroupByAreaPtInfos> groupPtInfos = new Dictionary<short, GroupByAreaPtInfos>();
+    protected Dictionary<short, GroupByAreaPtInfos> groupPtInfos_All = new Dictionary<short, GroupByAreaPtInfos>();//不管是否涂色都会记录
     protected short bianlun = -1;
     protected short fullShow = -2;
-    private Texture2D thumbnailTexture2d = null;
+    protected Texture2D thumbnailTexture2d = null;
     private bool isDebugTestToEnd = false;
     public GameObject clickPosEff = null;
     Dictionary<string, Color[]> allColor = new Dictionary<string, Color[]>();
@@ -528,7 +528,7 @@ public class mainGameView : MonoBehaviour
     }
     public void updateScaleView()
     {
-        Vector3 vector3 = lineImg.transform.localScale;
+        Vector3 vector3 = areaIdBase.transform.localScale;
         float dyMinShowFontSize = utilsTools.getGDataByKey<float>("dyMinShowFontSize", minShowFontSize);
         if (areaIdBase != null && perfabPath.Equals("") == false)
         {
@@ -717,16 +717,12 @@ public class mainGameView : MonoBehaviour
         
         utilsTools.sendEventObjectParams("inGameLoadingValue", 3f, false);
         fillAnimation = Boolean.Parse(utilsTools.getGDataByKey<String>("fillanimation", "false"));
-        int selectId = int.Parse(utilsTools.getGDataByKey<String>("highlight_areas", "0"));
-        if(selectId < 0 || selectId>= allSelectTexturePaths.Count())
-        {
-            selectId = 0;
-        }
-        selectTextureIdx = selectId;
+        
         this.gameScenUseInfo = gameUserInfo;
         for (short i = 0; i < gameUserInfo.areaInfoUseData.Count; i++)
         {
             var userAreaData = gameUserInfo.areaInfoUseData[i];
+            if(aid2selectOrderIdx.ContainsKey(userAreaData.id) == false)
                 aid2selectOrderIdx.Add(userAreaData.id, i);
         }
         utilsTools.setGDataByKey("loadBinBegin", utilsTools.getTotalMillisecond());
@@ -827,7 +823,7 @@ public class mainGameView : MonoBehaviour
             }
         });
     }
-    public void showArea(int areaId, OnAreaHandler onAreaHandler = null)
+    public virtual void showArea(int areaId, OnAreaHandler onAreaHandler = null)
     {
         if (areaId == -1)
         {
@@ -845,11 +841,6 @@ public class mainGameView : MonoBehaviour
             {
                 lineTexture2d.SetPixel(item.x,item.y, color);//回放使用
             }
-            //groupPtInfos_All[areaItem1.gid].getLineByAid(areaItem1.id, ref areaAllPts);
-            //foreach (var item in areaAllPts)
-            //{
-            //    lineTexture2d.SetPixel(item.x, item.y, color);
-            //}
             lineTexture2d.Apply();
         }
         else if (onAreaHandler != null)
@@ -858,7 +849,7 @@ public class mainGameView : MonoBehaviour
         }
     }
 
-    public bool switchShowAreaGroup(short gid, OnAreaHandler onAreaHandler = null)
+    public virtual bool switchShowAreaGroup(short gid, OnAreaHandler onAreaHandler = null)
     {
         //utilsTools.setGDataByKey("makeThumbnailBegin", utilsTools.getTotalMillisecond());
         if(utilsTools.ContainsKeyGDataByKey("firstSwitchShowAreaBegin") == false)
@@ -1268,7 +1259,7 @@ public class mainGameView : MonoBehaviour
             
         }
     }
-    public void resetSize()
+    public virtual void resetSize()
     {
         //怎么保持宽高比
         float width = lineTexture2d.width;
@@ -1276,20 +1267,6 @@ public class mainGameView : MonoBehaviour
         float bet = width / height;
         RectTransform rectTransform = lineImg.GetComponent<RectTransform>();
         RectTransform baseTransform = rectTransform.transform.parent.GetComponent<RectTransform>();
-        Vector2 maxSize = new Vector2(baseTransform.rect.width * 0.95f,baseTransform.rect.height * 0.95f);
-        float bet1 = 1.0f;
-        //while (true)
-        //{
-        //    float tempWidth = rectTransform.rect.width * bet1 * rectTransform.localScale.x;
-        //    float tempHeight = rectTransform.rect.width / bet * bet1 * rectTransform.localScale.y;
-        //    if (tempWidth < maxSize.x && tempHeight < maxSize.y)
-        //    {
-        //        width = tempWidth;
-        //        height = tempHeight;
-        //        break;
-        //    }
-        //    bet1 = bet1 * 0.95f;
-        //}
         if (width.Equals(height))
         {
             width = utilsTools.DisplaySize.x * 1;
@@ -1320,7 +1297,7 @@ public class mainGameView : MonoBehaviour
             utilsTools.setGDataByKey("sltTextureSize",new Vector2(lowImgTexture2d.width/4,lowImgTexture2d.height/4));
         }
     }
-    public bool getSize(out int width,out int height)
+    public virtual bool getSize(out int width,out int height)
     {
         width = -1;
         height = -1;
@@ -1447,7 +1424,7 @@ public class mainGameView : MonoBehaviour
             utilsTools.sendEventObjectParams("gamePlayerEndHandler");
         }
     }
-    private void loadSelectImageTexture(Texture2D nowSelectTexture,NotifyEmptParam notify, int width = 0,int height = 0)
+    protected virtual void loadSelectImageTexture(Texture2D nowSelectTexture,NotifyEmptParam notify, int width = 0,int height = 0)
     {
         if(width == 0 || height == 0)
         {
@@ -1506,7 +1483,7 @@ public class mainGameView : MonoBehaviour
         }, objects2);
 
     }
-    private void loadSelectImageTextureId(int idx = 0, NotifyEmptParam notify = null)
+    protected void loadSelectImageTextureId(int idx = 0, NotifyEmptParam notify = null)
     {
         string path = allSelectTexturePaths[idx];
         var req = Resources.LoadAsync<Texture2D>(path);