v 1.6

CGTool/Anime.cs

@@ -239,7 +239,7 @@ namespace CGTool
                 if(graphicData == null) continue;
                 graphicDatas[i] = graphicData;
                 if(graphicData.Height > textureHeight) textureHeight = graphicData.Height;
-                textureWidth += graphicData.Width;
+                textureWidth += graphicData.Width + 5;
                 animeDetail.AnimeFrameInfos[i].Width = (int) graphicData.Width;
                 animeDetail.AnimeFrameInfos[i].Height = (int) graphicData.Height;
                 animeDetail.AnimeFrameInfos[i].OffsetX = (int) graphicInfoData.OffsetX;
@@ -264,7 +264,7 @@ namespace CGTool
                 texture2dMix.SetPixels32((int) offsetX, 0, (int) graphicData.Width,
                     (int) graphicData.Height,
                     graphicData.Sprite.texture.GetPixels32());
-                offsetX += (int) graphicData.Width;
+                offsetX += (int) graphicData.Width + 5;
             }
             texture2dMix.Apply();
             
@@ -282,7 +282,7 @@ namespace CGTool
                 Sprite sprite = Sprite.Create(texture2dMix, new Rect(offsetX, 0,
                         animeDetail.AnimeFrameInfos[l].Width, animeDetail.AnimeFrameInfos[l].Height),
                     pivot, 1, 1, SpriteMeshType.FullRect);
-                offsetX += animeDetail.AnimeFrameInfos[l].Width;
+                offsetX += animeDetail.AnimeFrameInfos[l].Width + 5;
                 animeFrameInfo.AnimeSprites.Add(paletIndex, sprite);
             }
             

CGTool/AnimePlayer.cs

@@ -82,6 +82,7 @@ namespace CGTool
         //绑定渲染对象
         [SerializeField,Header("Image渲染")] public bool isRenderByImage = false;
         [SerializeField,Header("序列帧合批")] public bool isFrameBatch = false;
+        [Header("序列帧Texture")] public Texture2D frameTexture;
         private SpriteRenderer _spriteRenderer;
         private Image _imageRenderer;
         private int _paletIndex = 0;
@@ -384,6 +385,11 @@ namespace CGTool
             gameObject.SetActive(false);
         }
 
+        public void Pause()
+        {
+            isPlayable = false;
+        }
+
         //修改播放类型---重复方法--考虑删掉
         public void ChangePlayType(Anime.PlayType playType)
         {
@@ -520,6 +526,7 @@ namespace CGTool
                 _rectTransform.pivot = new Vector2(0.5f,0f);
                 _rectTransform.localPosition = Vector3.zero;
             }
+            frameTexture = _frames[_currentFrame].Sprite.texture;
             
             // Vector2 offset = Vector2.zero;
             // offset.x += -(_frames[_currentFrame].GraphicInfo.OffsetX * 1f) / _frames[_currentFrame].GraphicInfo.Width;

CGTool/AudioTool.cs

@@ -42,7 +42,7 @@ namespace CGTool
                 Dictionary<int,string> map = type == Type.BGM ? _bgmMap : _effectMap;
                 if(map.TryGetValue(id, out string audioPath))
                 {
-                    audioClip = Resources.Load<AudioClip>(audioPath);
+                    audioClip = UnityEngine.Resources.Load<AudioClip>(audioPath);
                     return audioClip;
                 }
                 else

CGTool/CGTool.cs

@@ -15,15 +15,21 @@ namespace CGTool
     public static class CGTool
     {
         //Bin基础目录
-        public readonly static string BaseFolder = System.Environment.CurrentDirectory + "/bin";
+        public static string BaseFolder = System.Environment.CurrentDirectory + "/bin";
         //Palet调色板目录
-        public readonly static string PaletFolder = BaseFolder + "/pal";
+        public static string PaletFolder = BaseFolder + "/pal";
         //Map地图文件目录
-        public readonly static string MapFolder = BaseFolder + "/map";
+        public static string MapFolder = BaseFolder + "/map";
 
         //初始化CGTool
-        public static void Init()
+        public static void Init(string binPath = null)
         {
+            if (!string.IsNullOrEmpty(binPath))
+            {
+                BaseFolder = binPath;
+                PaletFolder = BaseFolder + "/pal";
+                MapFolder = BaseFolder + "/map";
+            }
             //初始化加载并缓存 0-15 调色板文件
             for (int i = 0; i < 16; i++) Palet.GetPalet(i);
             

CGTool/Map.cs

@@ -13,6 +13,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using UnityEngine;
 
 namespace CGTool
 {
@@ -122,27 +123,70 @@ namespace CGTool
             MapInfo mapInfo = new MapInfo();
             mapInfo.Serial = serial;
 
+            bool isClientMapFile = false;
+
             //地图文件头
-            byte[] mapHeader = mapFileReader.ReadBytes( 8);
-            //地图名称
-            byte[] mapNameBytes = mapFileReader.ReadBytes(32);
-            string[] mapHead = System.Text.Encoding.GetEncoding("GBK").GetString(mapNameBytes).Split('|');
-            mapInfo.Name = mapHead[0];
-            
-            // 调色板
-            if (mapHead.Length>1){
-                if(mapHead[1] != null || mapHead[1] != "") mapInfo.Palet = int.Parse(mapHead[1]);
+            byte[] mapHeader = mapFileReader.ReadBytes( 6);
+            if(mapHeader[0]==0x4C && mapHeader[1]==0x53 && mapHeader[2]==0x32 && mapHeader[3]==0x4D && mapHeader[4]==0x41 && mapHeader[5]==0x50){
+                isClientMapFile = false;
+                Debug.Log("地图文件头: 服务端地图");
+            }else if (mapHeader[0]==0x4D && mapHeader[1]==0x41 && mapHeader[2]==0x50){
+                isClientMapFile = true;
+                Debug.Log("地图文件头: 客户端地图");
+            }
+            else
+            {
+                Debug.Log("地图文件头错误: " + _mapIndexFiles[serial].FileName);
+                return null;
             }
 
-
-            //读取地图宽度
-            byte[] bytes = mapFileReader.ReadBytes(2);
-            Array.Reverse(bytes);
-            mapInfo.Width = BitConverter.ToUInt16(bytes,0);
-            //读取地图高度
-            bytes = mapFileReader.ReadBytes(2);
-            Array.Reverse(bytes);
-            mapInfo.Height = BitConverter.ToUInt16(bytes,0);
+            byte[] bytes;
+            if (isClientMapFile)
+            {
+                // 无用信息
+                mapFileReader.ReadBytes(6);
+                //读取地图宽度
+                bytes = mapFileReader.ReadBytes(4);
+                mapInfo.Width = BitConverter.ToUInt16(bytes,0);
+                //读取地图高度
+                bytes = mapFileReader.ReadBytes(4);
+                mapInfo.Height = BitConverter.ToUInt16(bytes,0);
+                if (MapExtra.ClientMapExtraDatas.ContainsKey(serial))
+                {
+                    mapInfo.Name = MapExtra.ClientMapExtraDatas[serial].Name;
+                    mapInfo.Palet = MapExtra.ClientMapExtraDatas[serial].Palet;
+                }
+                else
+                {
+                    mapInfo.Name = "未知领域";
+                    mapInfo.Palet = -1;
+                }
+            }
+            else
+            {
+                // 无用信息
+                mapFileReader.ReadBytes(2);
+                //地图名称
+                byte[] mapNameBytes = mapFileReader.ReadBytes(32);
+                string[] mapHead = System.Text.Encoding.GetEncoding("GBK").GetString(mapNameBytes).Split('|');
+                mapInfo.Name = mapHead[0];
+            
+                // 调色板
+                if (mapHead.Length>1){
+                    if(mapHead[1] != null || mapHead[1] != "") mapInfo.Palet = int.Parse(mapHead[1]);
+                }
+                
+                //读取地图宽度
+                bytes = mapFileReader.ReadBytes(2);
+                Array.Reverse(bytes);
+                mapInfo.Width = BitConverter.ToUInt16(bytes,0);
+                //读取地图高度
+                bytes = mapFileReader.ReadBytes(2);
+                Array.Reverse(bytes);
+                mapInfo.Height = BitConverter.ToUInt16(bytes,0);
+            }
+            
+            Debug.Log("地图宽度: " + mapInfo.Width + " 地图高度: " + mapInfo.Height);
 
             byte[] mapBytes = mapFileReader.ReadBytes((int) (mapInfo.Width * mapInfo.Height * 2));
             byte[] mapCoverBytes = mapFileReader.ReadBytes((int) (mapInfo.Width * mapInfo.Height * 2));
@@ -168,7 +212,7 @@ namespace CGTool
                 //地面数据
                 MapBlockData mapTile = null;
                 bytes = mapReader.ReadBytes(2);
-                Array.Reverse(bytes);
+                if(!isClientMapFile) Array.Reverse(bytes);
                 uint mapGraphicSerial = BitConverter.ToUInt16(bytes,0);
                 int Version = 0;
                 if (mapGraphicSerial > 20000)
@@ -187,7 +231,7 @@ namespace CGTool
                 
                 MapBlockData mapCoverTile = null;
                 bytes = mapCoverReader.ReadBytes(2);
-                Array.Reverse(bytes);
+                if(!isClientMapFile) Array.Reverse(bytes);
                 uint mapCoverGraphicSerial = BitConverter.ToUInt16(bytes,0);
                 Version = 0;
                 if (mapCoverGraphicSerial > 30000 || mapCoverGraphicSerial==25290)

README.md

@@ -216,11 +216,20 @@ player.Stop();
 > * `Anime` 动画数据解析
 > * `AudioTool` 音频索引及加载
 > * `AnimePlayer` 动画播放器挂载组件
-> * `Map` 服务端地图数据解析
+> * `Map` 服务端/客户端 图数据解析
 
 
 
 ## 4、更新日志
+### v 1.6
+> `ADD` 加入<font color="red">客户端</font>地图读取支持，同时附加了客户端地图文件缺失的名字和调色版映射表
+>
+> `UPD` Anime合批处理图形之间增加间隔,避免出现像素黏连
+>
+> `UPD` AnimePlayer挂载件预留FrameTexture属性可在Editor中查看合批的图像
+>
+> `UPD` CGTool入口调整，可指定bin目录位置
+
 ### v 1.5
 > `UPD` Anime序列帧合批忘了考虑不同调色板的问题，现已增加相关处理