update 1.1

CGTool/Anime.cs

@@ -36,6 +36,10 @@ namespace CGTool
     {
         //图档编号
         public uint GraphicIndex;
+        //宽度
+        public int Width;
+        //高度
+        public int Height;
         //偏移X
         public int OffsetX;
         //偏移Y
@@ -44,6 +48,8 @@ namespace CGTool
         public int AudioIndex;
         //动效编号
         public Anime.EffectType Effect;
+        //动画Sprite
+        public Sprite AnimeSprite;
     }
 
     //动画数据
@@ -55,8 +61,8 @@ namespace CGTool
         public int ActionType;
         public uint CycleTime;
         public uint FrameCount;
+        public Texture2D AnimeTexture;
         public AnimeFrameInfo[] AnimeFrameInfos;
-        
         // public byte[] unknown;
     }
     //动画相关Enum类型
@@ -75,6 +81,13 @@ namespace CGTool
             West=6,
             NorthWest=7
         }
+        //方向九宫映射表
+        public static DirectionType[,] DirectionTypeMap = new DirectionType[3,3]
+        {
+            {DirectionType.North,DirectionType.NorthEast,DirectionType.East},
+            {DirectionType.NorthWest,DirectionType.NULL,DirectionType.SouthEast},
+            {DirectionType.West,DirectionType.SouthWest,DirectionType.South}
+        };
         //动作(未补全)
         public enum ActionType
         {
@@ -84,6 +97,17 @@ namespace CGTool
             Run=3,
             AfterRun=4,
             Attack=5,
+            Magic=6,
+            Throw=7,
+            Hurt=8,
+            Defence=9,
+            Dead=10,
+            Sit=11,
+            Hi=12,
+            Happy=13,
+            Angry=14,
+            Sad=15,
+            Shock=16,
         }
         //动效
         public enum EffectType
@@ -91,26 +115,68 @@ namespace CGTool
             Hit=1,
             HitOver=2
         }
+
+        public enum PlayType
+        {
+            Loop,
+            Once,
+            OnceAndDestroy
+        }
         //动画列表缓存    Index -> AnimeInfo
         private static Dictionary<uint, AnimeInfo> _animeInfoCache = new Dictionary<uint, AnimeInfo>();
 
-        //动画序列缓存    Direction -> Action -> AnimeData
-        // private static Dictionary<uint, Dictionary<int, AnimeData>> _animeCache =
-        //     new Dictionary<uint, Dictionary<int, AnimeData>>();
-        
-        private static List<string> _animeInfoFiles = new List<string>()
+        //动画序列文件前缀    Direction -> Action -> AnimeData
+        private static Dictionary<int,string> _animeInfoVersionPrefex = new Dictionary<int, string>()
         {
             //龙之沙漏 之前版本前Info数据
-            "AnimeInfo_4.bin",
+            {0,"AnimeInfo_"},
             //龙之沙漏 版本Info数据
-            "AnimeInfoEx_1.Bin"
+            {1,"AnimeInfoEx_"}
         };
+        private static List<string> _animeInfoFilePaths = new List<string>();
 
-        private static List<string> _animeDataFiles = new List<string>()
+        //动画数据文件前缀
+        private static Dictionary<int,string> _animeDataVersionPrefex = new Dictionary<int, string>()
         {
-            "Anime_4.bin", "AnimeEx_1.Bin"
+            //龙之沙漏 之前版本前Data数据
+            {0,"Anime_"},
+            //龙之沙漏 版本Data数据
+            {1,"AnimeEx_"}
         };
+        private static List<string> _animeDataFilePaths = new List<string>();
 
+        //初始化并缓存动画信息
+        public static void Init()
+        {
+            DirectoryInfo directoryInfo = new DirectoryInfo(CGTool.BaseFolder);
+            FileInfo[] files = directoryInfo.GetFiles();
+            
+            for (int i = 0; i < _animeInfoVersionPrefex.Count; i++)
+            {
+                foreach (FileInfo fileInfo in files)
+                {
+                    if (fileInfo.Name.StartsWith(_animeInfoVersionPrefex[i]))
+                    {
+                        _animeInfoFilePaths.Add(fileInfo.Name);
+                    }
+                    if(fileInfo.Name.StartsWith(_animeDataVersionPrefex[i]))
+                    {
+                        _animeDataFilePaths.Add(fileInfo.Name);
+                    }
+                }
+            }
+            if(_animeInfoFilePaths.Count==0) Debug.LogError("未找到动画信息文件");
+            if(_animeDataFilePaths.Count==0) Debug.LogError("未找到动画数据文件");
+            if(_animeDataFilePaths.Count!=_animeInfoFilePaths.Count) Debug.LogError("动画信息文件与动画数据文件数量不匹配");
+            
+            //加载动画信息
+            for (int i = 0; i < _animeInfoFilePaths.Count; i++)
+            {
+                
+                Dictionary<uint, AnimeInfo> animeInfos = _loadAnimeInfo(i);
+                Debug.Log("加载动画信息版本:[" + i + "]  动画数量:" + animeInfos.Count);
+            }
+        }
         //获取动画数据信息
         public static AnimeInfo GetAnimeInfo(uint Index)
         {
@@ -131,19 +197,89 @@ namespace CGTool
             if (animeInfo == null) return null;
             if (animeInfo.AnimeDatas.ContainsKey((int)Direction))
             {
-                if (animeInfo.AnimeDatas[(int)Direction].ContainsKey((int) Action))
+                if (animeInfo.AnimeDatas[(int) Direction].ContainsKey((int) Action))
+                {
+                    AnimeDetail animeDetail = animeInfo.AnimeDatas[(int) Direction][(int) Action];
+                    // if(animeDetail.AnimeTexture == null) prepareAnimeFrames(animeDetail);
                     return animeInfo.AnimeDatas[(int)Direction][(int) Action];
+                }
             }
 
             return null;
         }
+
+        //预处理动画图形合批,这个返回的是一个所有帧合并后的Texture2D
+        private static void prepareAnimeFrames(AnimeDetail animeDetail)
+        {
+            //动态合并Texture2D
+            GraphicData[] graphicDatas = new GraphicData[animeDetail.FrameCount];
+            uint textureWidth = 0;
+            uint textureHeight = 0;
+            
+            
+            for (var i = 0; i < animeDetail.FrameCount; i++)
+            {
+                //载入图档
+                GraphicInfoData graphicInfoData = GraphicInfo.GetGraphicInfoDataByIndex(animeDetail.Version,animeDetail.AnimeFrameInfos[i].GraphicIndex);
+                if (graphicInfoData == null) continue;
+                GraphicData graphicData = Graphic.GetGraphicData(graphicInfoData);
+                if(graphicData == null) continue;
+                graphicDatas[i] = graphicData;
+                if(graphicData.Height > textureHeight) textureHeight = graphicData.Height;
+                textureWidth += graphicData.Width;
+                animeDetail.AnimeFrameInfos[i].Width = (int) graphicData.Width;
+                animeDetail.AnimeFrameInfos[i].Height = (int) graphicData.Height;
+                animeDetail.AnimeFrameInfos[i].OffsetX = (int) graphicInfoData.OffsetX;
+                animeDetail.AnimeFrameInfos[i].OffsetY = (int) graphicInfoData.OffsetY;
+            }
+            //合并图档
+            Texture2D texture2dMix = new Texture2D((int) textureWidth, (int) textureHeight, TextureFormat.RGBA32, false,
+                true);
+            Color32 transparentColor = new Color32(0, 0, 0, 0);
+            Color32[] transparentColors = new Color32[texture2dMix.width * texture2dMix.height];
+            for (var i = 0; i < transparentColors.Length; i++)
+            {
+                transparentColors[i] = transparentColor;
+            }
+            texture2dMix.SetPixels32(transparentColors,0);
+            int offsetX = 0;
+            for (var i = 0; i < animeDetail.FrameCount; i++)
+            {
+                GraphicData graphicData = graphicDatas[i];
+                if(graphicData == null) continue;
+                texture2dMix.SetPixels32((int) offsetX, 0, (int) graphicData.Width,
+                    (int) graphicData.Height,
+                    graphicData.Sprite.texture.GetPixels32());
+                offsetX += (int) graphicData.Width;
+            }
+            texture2dMix.Apply();
+            
+            animeDetail.AnimeTexture = texture2dMix;
+            
+            //创建动画每帧Sprite
+            offsetX = 0;
+            for (var l = 0; l < animeDetail.FrameCount; l++)
+            {
+                if(graphicDatas[l] == null) continue;
+                AnimeFrameInfo animeFrameInfo = animeDetail.AnimeFrameInfos[l];
+                Vector2 pivot = new Vector2(0f, 1f);
+                pivot.x += -(animeFrameInfo.OffsetX * 1f) / animeFrameInfo.Width;
+                pivot.y -= (-animeFrameInfo.OffsetY * 1f) / animeFrameInfo.Height;
+                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;
+                animeFrameInfo.AnimeSprite = sprite;
+            }
+            
+        }
         
         //加载动画数据
         private static Dictionary<uint, AnimeInfo> _loadAnimeInfo(int Version)
         {
             //查找Info文件
-            string infoFileName = _animeInfoFiles[Version];
-            string dataFileName = _animeDataFiles[Version];
+            string infoFileName = _animeInfoFilePaths[Version];
+            string dataFileName = _animeDataFilePaths[Version];
             FileInfo infoFile = new FileInfo(CGTool.BaseFolder + "/" + infoFileName);
             FileInfo dataFile = new FileInfo(CGTool.BaseFolder + "/" + dataFileName);
             if (!infoFile.Exists || !dataFile.Exists) return null;
@@ -165,7 +301,6 @@ namespace CGTool
                 animeInfo.Addr = BitConverter.ToUInt32(infoFileReader.ReadBytes(4),0);
                 animeInfo.ActionCount = infoFileReader.ReadUInt16();
                 animeInfo.Unknow = infoFileReader.ReadBytes(2);
-                // print(JsonUtility.ToJson(animeInfo));
                 dataFileStream.Position = animeInfo.Addr;
                 for (int j = 0; j < animeInfo.ActionCount; j++)
                 {
@@ -177,6 +312,8 @@ namespace CGTool
                     animeData.CycleTime = BitConverter.ToUInt32(dataFileReader.ReadBytes(4),0);
                     animeData.FrameCount = BitConverter.ToUInt32(dataFileReader.ReadBytes(4),0);
                     animeData.AnimeFrameInfos = new AnimeFrameInfo[animeData.FrameCount];
+                    
+                    
                     // if (animeInfo.Index == 101201) Debug.Log("----------------------------------");
                     for (int k = 0; k < animeData.FrameCount; k++)
                     {
@@ -188,8 +325,6 @@ namespace CGTool
                         // if (animeInfo.Index == 101201)
                         // {
                         //     byte[] tt = dataFileReader.ReadBytes(6);
-                        //     
-                        //     Debug.Log(tt[0]+" "+tt[1]+" "+tt[2]+" "+tt[3]+" "+tt[4]+" "+tt[5]);
                         // }
                         // else
                         // {
@@ -197,19 +332,30 @@ namespace CGTool
                         // }
                         animeData.AnimeFrameInfos[k].OffsetX = BitConverter.ToInt16(dataFileReader.ReadBytes(2),0);
                         animeData.AnimeFrameInfos[k].OffsetY = BitConverter.ToInt16(dataFileReader.ReadBytes(2),0);
-                        animeData.AnimeFrameInfos[k].AudioIndex = dataFileReader.ReadByte();
-                        int effect = dataFileReader.ReadByte();
-                        if (effect == 0x27 || effect == 0x28)
+                        
+                        //标识位
+                        int flag = BitConverter.ToInt16(dataFileReader.ReadBytes(2),0);
+
+                        if (animeData.Index == 110053) Debug.Log("FLAG---" + " " + k + "  " + flag);
+
+                        if (flag>20000)
                         {
+                            //击打判定
                             animeData.AnimeFrameInfos[k].Effect = EffectType.Hit;
+                            animeData.AnimeFrameInfos[k].AudioIndex = flag - 20000;
                         }
-                        else if(effect == 0x4E || effect == 0x4F)
+                        else if(flag>10000)
                         {
+                            //攻击动作结束判定
                             animeData.AnimeFrameInfos[k].Effect = EffectType.HitOver;
+                            animeData.AnimeFrameInfos[k].AudioIndex = flag - 10000;
+                        }
+                        else
+                        {
+                            animeData.AnimeFrameInfos[k].AudioIndex = flag;
                         }
-                        // animeData.AnimeFrameInfos[k].Effect = dataFileReader.ReadByte();
                     }
-                    
+
                     if (!animeInfo.AnimeDatas.ContainsKey(animeData.Direction))
                         animeInfo.AnimeDatas.Add(animeData.Direction, new Dictionary<int, AnimeDetail>());
 

CGTool/AnimePlayer.cs

@@ -9,13 +9,15 @@
  */
 
 
+using System;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 
 namespace CGTool
 {
     //动画周期回调
-    public delegate void AnimeCallback();
+    public delegate void AnimeCallback(Anime.ActionType actionType);
     
     //动画动作帧监听
     public delegate void AnimeEffectListener(Anime.EffectType effect);
@@ -28,14 +30,13 @@ namespace CGTool
     
     /**
      * 动画播放器,用于播放CG动画,支持多动画队列播放
-     * 脚本需绑定至挂载了SpriteRenderer和RectTransform的对象上
-     * 除此之外,还需绑定BoxCollider2D(可选),用于监听鼠标的移入移出事件
+     * 脚本需绑定至挂载了SpriteRenderer、Image和RectTransform的对象上
+     * ########除此之外,还需绑定BoxCollider2D(可选),用于监听鼠标的移入移出事件#####此条删除
      *
      * 当动画播放完成后会自动调用onFinishCallback回调函数
      * 另外可指定onActionListener和onAudioListener监听动画动作帧和音频帧
      * 目前已知的动作帧有:
-     * 击中 0x27 | 0x28
-     * 伤害结算 0x4E | 0x4F
+     * 击中 伤害结算
      */
     public class AnimePlayer : MonoBehaviour
     {
@@ -53,15 +54,18 @@ namespace CGTool
         {
             public uint AnimeSerial;
             public Anime.DirectionType Direction;
-            public Anime.ActionType ActionType;
-            public bool Infinity;
+            public Anime.ActionType actionType;
+            public Anime.PlayType playType;
             public float Speed;
             public float FrameRate;
             public AnimeDetail AnimeDetail;
             public AnimeCallback onFinishCallback;
         }
         
+        
+        
         //当前播放
+        private uint _currentSerial;
         private AnimeOption _currentAnime;
         private AnimeFrame[] _frames;
         private int _currentFrame;
@@ -74,9 +78,24 @@ namespace CGTool
         
         //计时器
         private float _timer;
+        //下一帧延迟
+        private float _delay;
         
-        //绑定SpriteRenderer
+        //绑定渲染对象
+        [SerializeField,Header("Image渲染")] public bool isRenderByImage = false;
         private SpriteRenderer _spriteRenderer;
+        private Image _imageRenderer;
+        private int _paletIndex = 0;
+        public int PaletIndex
+        {
+            get { return _paletIndex; }
+            set
+            {
+                _paletIndex = value;
+                if (_currentAnime != null) _play(_currentAnime);
+            }
+        }
+        
         //绑定RectTransform
         private RectTransform _rectTransform;
         //绑定BoxCollider2D(可选)
@@ -95,8 +114,8 @@ namespace CGTool
         {
             get
             {
-                float offsetX = -_frames[_currentFrame].GraphicInfo.OffsetX;
-                float offsetY = _frames[_currentFrame].GraphicInfo.OffsetY;
+                float offsetX = -_frames[_currentFrame].AnimeFrameInfo.OffsetX;
+                float offsetY = _frames[_currentFrame].AnimeFrameInfo.OffsetY;
                 return new Vector2(offsetX, offsetY);
             }
         }
@@ -104,10 +123,18 @@ namespace CGTool
         //实例初始化时获取相关绑定
         private void Awake()
         {
-            _spriteRenderer = GetComponentInParent<SpriteRenderer>();
-            _rectTransform = GetComponentInParent<RectTransform>();
+            //调整渲染
+            _imageRenderer = GetComponent<Image>();
+            _spriteRenderer = GetComponent<SpriteRenderer>();
+            _rectTransform = GetComponent<RectTransform>();
             //碰撞盒,仅当需要添加鼠标事件时使用
             _boxCollider2D = GetComponent<BoxCollider2D>();
+            
+        }
+
+        private void Start()
+        {
+            _updateRenderMode();
         }
 
         //鼠标移入监听
@@ -121,6 +148,61 @@ namespace CGTool
         {
             if(onMouseExitListener!=null) onMouseExitListener(this);
         }
+        
+        // 使用Image模式渲染
+        public bool RenderByImage
+        {
+            get => isRenderByImage;
+            set
+            {
+                isRenderByImage = value;
+                _updateRenderMode();
+            }
+        }
+        
+        // 设置当前播放序列,默认方向North,动作Stand,播放类型Loop,播放速度1f
+        public uint Serial
+        {
+            get => _currentSerial;
+            set
+            {
+                Anime.DirectionType direction =
+                    _currentAnime?.Direction ?? Anime.DirectionType.North;
+                Anime.ActionType actionType = _currentAnime?.actionType ?? Anime.ActionType.Stand;
+                Anime.PlayType playType = _currentAnime?.playType ?? Anime.PlayType.Loop;
+                float speed = _currentAnime?.Speed ?? 1f;
+                AnimeCallback onFinishCallback = _currentAnime?.onFinishCallback;
+                play(value, direction, actionType, playType, speed, onFinishCallback);
+            }
+        }
+        
+        // 动态调整播放类型
+        public Anime.PlayType PlayType
+        {
+            get => _currentAnime?.playType ?? Anime.PlayType.Loop;
+            set
+            {
+                if (_currentAnime != null)
+                {
+                    _currentAnime.playType = value;
+                }
+            }
+        }
+
+        // 更新渲染模式
+        private void _updateRenderMode()
+        {
+            if (isRenderByImage)
+            {
+                _imageRenderer.enabled = true;
+                _spriteRenderer.enabled = false;
+            }
+            else
+            {
+                _imageRenderer.enabled = false;
+                _spriteRenderer.enabled = true;
+            }
+        }
 
         /**
          * 播放动画,调用此方法将会清空当前播放队列,调用完成可通过链式调用nextPlay方法添加动画到播放队列
@@ -132,41 +214,68 @@ namespace CGTool
          * @param onFinishCallback 动画结束回调
          * @return AnimePlayer
          */
-        public AnimePlayer play(uint Serial,Anime.DirectionType Direction,Anime.ActionType ActionType,bool Infinity = false,float Speed=1f,AnimeCallback onFinishCallback=null)
+        public AnimePlayer play(uint Serial, Anime.DirectionType Direction = Anime.DirectionType.North,
+            Anime.ActionType actionType = Anime.ActionType.Stand, Anime.PlayType playType = Anime.PlayType.Once,
+            float Speed = 1f, AnimeCallback onFinishCallback = null)
         {
             if (_spriteRenderer == null)
             {
-                Debug.Log("AnimePlayer:SpriteRenderer is null");
+                // Debug.Log("AnimePlayer:SpriteRenderer is null");
                 return this;
             }
-            AnimeOption animeOption = CreateAnimeOption(Serial, Direction, ActionType, Infinity, Speed, onFinishCallback);
+            AnimeOption animeOption = CreateAnimeOption(Serial, Direction, actionType, playType, Speed, onFinishCallback);
             if (animeOption == null)
             {
-                Debug.Log("AnimePlayer:AnimeOption create failed");
+                if (onFinishCallback != null) onFinishCallback(actionType);
+                // Debug.Log("AnimePlayer:AnimeOption create failed");
                 return this;
             }
             //清空播放队列
             _animeQueue.Clear();
             //播放
+            _currentSerial = Serial;
             _play(animeOption);
             
             //链式调用,后续可通过nextPlay方法添加动画到播放队列
             return this;
         }
 
+        //播放动画
+        public AnimePlayer play(uint Serial, Anime.PlayType playType, float speed = 1f,
+            AnimeCallback onFinishCallback = null)
+        {
+            return play(Serial,Anime.DirectionType.North,Anime.ActionType.Stand,playType,speed,onFinishCallback);
+        }
+
+        //播放一次
+        public AnimePlayer playOnce(Anime.DirectionType directionType,Anime.ActionType actionType,float Speed=1f,AnimeCallback onFinishCallback=null)
+        {
+            return play(_currentSerial, directionType, actionType, Anime.PlayType.Once,
+                Speed, onFinishCallback);
+        }
+        
+        //播放循环
+        public AnimePlayer playLoop(Anime.DirectionType directionType,Anime.ActionType actionType,float Speed=1f,AnimeCallback onFinishCallback=null)
+        {
+            return play(_currentSerial, directionType, actionType, Anime.PlayType.Loop,
+                Speed, onFinishCallback);
+        }
+
         //调整动画方向
         public void changeDirection(Anime.DirectionType directionType)
         {
-            _currentAnime = CreateAnimeOption(_currentAnime.AnimeSerial, directionType, _currentAnime.ActionType,
-                _currentAnime.Infinity, _currentAnime.Speed, _currentAnime.onFinishCallback);
+            if (directionType == _currentAnime.Direction || directionType == Anime.DirectionType.NULL) return;
+            _currentAnime = CreateAnimeOption(_currentAnime.AnimeSerial, directionType, _currentAnime.actionType,
+                _currentAnime.playType, _currentAnime.Speed, _currentAnime.onFinishCallback);
             _play(_currentAnime);
         }
         
         //调整动画动作类型
         public void changeActionType(Anime.ActionType actionType)
         {
+            if (actionType == _currentAnime.actionType) return;
             _currentAnime = CreateAnimeOption(_currentAnime.AnimeSerial, _currentAnime.Direction,actionType,
-                _currentAnime.Infinity, _currentAnime.Speed, _currentAnime.onFinishCallback);
+                _currentAnime.playType, _currentAnime.Speed, _currentAnime.onFinishCallback);
             _play(_currentAnime);
         }
 
@@ -174,12 +283,14 @@ namespace CGTool
         private void _play(AnimeOption animeOption)
         {
             isPlayable = false;
-            _currentAnime = animeOption;
-            _frames = new AnimeFrame[animeOption.AnimeDetail.FrameCount];
+            _currentAnime = null;
             
+            AnimeFrame[] frames = new AnimeFrame[animeOption.AnimeDetail.FrameCount];
+
             //获取动画帧数据
             for (int i = 0; i < animeOption.AnimeDetail.AnimeFrameInfos.Length; i++)
             {
+                AnimeFrameInfo animeFrameInfo = animeOption.AnimeDetail.AnimeFrameInfos[i];
                 GraphicInfoData graphicInfoData = GraphicInfo.GetGraphicInfoDataByIndex(animeOption.AnimeDetail.Version, animeOption.AnimeDetail.AnimeFrameInfos[i].GraphicIndex);
                 if (graphicInfoData == null)
                 {
@@ -187,7 +298,8 @@ namespace CGTool
                               animeOption.AnimeDetail.AnimeFrameInfos[i] + " is null");
                     continue;
                 }
-                GraphicData graphicData = Graphic.GetGraphicData(graphicInfoData);
+
+                GraphicData graphicData = Graphic.GetGraphicData(graphicInfoData, _paletIndex);
                 if (graphicData == null)
                 {
                     Debug.Log("GraphicData Version:" + animeOption.AnimeDetail.Version + " Index:" +
@@ -196,34 +308,59 @@ namespace CGTool
                 }
                 
                 //创建帧数据
-                _frames[i] = new AnimeFrame();
-                _frames[i].Index = i;
-                _frames[i].GraphicInfo = graphicInfoData;
-                _frames[i].Sprite = graphicData.Sprite;
-                _frames[i].AnimeFrameInfo = animeOption.AnimeDetail.AnimeFrameInfos[i];
+                frames[i] = new AnimeFrame();
+                frames[i].Index = i;
+                frames[i].GraphicInfo = graphicInfoData;
+                frames[i].Sprite = graphicData.Sprite;
+                frames[i].AnimeFrameInfo = animeFrameInfo;
             }
 
+            _currentAnime = animeOption;
+            _frames = frames;
             _currentFrame = -1;
             isPlayable = true;
+            gameObject.SetActive(true);
             UpdateFrame();
         }
 
+        //播放延时
+        public void DelayPlay(float delayTime)
+        {
+            _delay = delayTime*1000;
+        }
+
+        public void Stop()
+        {
+            isPlayable = false;
+            _currentAnime = null;
+            _frames = null;
+            _currentFrame = -1;
+            gameObject.SetActive(false);
+        }
+
+        //修改播放类型---重复方法--考虑删掉
+        public void ChangePlayType(Anime.PlayType playType)
+        {
+            if (_currentAnime == null) return;
+            _currentAnime.playType = playType;
+        }
+
         //创建动画配置
         private AnimeOption CreateAnimeOption(uint Serial, Anime.DirectionType Direction, Anime.ActionType ActionType,
-            bool Infinity = false, float Speed = 1f, AnimeCallback onFinishCallback = null)
+            Anime.PlayType playType=Anime.PlayType.Once, float Speed = 1f, AnimeCallback onFinishCallback = null)
         {
             AnimeDetail animeDetail = Anime.GetAnimeDetail(Serial, Direction, ActionType);
             if (animeDetail == null)
             {
-                Debug.Log("AnimePlayer:AnimeDetail is null");
+                // Debug.Log("AnimePlayer:AnimeDetail is null");
                 return null;
             }
             AnimeOption animeOption = new AnimeOption()
             {
                 AnimeSerial = Serial,
                 Direction = Direction,
-                ActionType = ActionType,
-                Infinity = Infinity,
+                actionType = ActionType,
+                playType = playType,
                 Speed = Speed,
                 FrameRate = animeDetail.CycleTime / Speed / animeDetail.FrameCount,
                 AnimeDetail = animeDetail,
@@ -234,24 +371,44 @@ namespace CGTool
 
         //加入链式动画播放队列
         public AnimePlayer nextPlay(uint Serial, Anime.DirectionType Direction, Anime.ActionType ActionType,
-            bool Infinity = false, float Speed = 1f, AnimeCallback onFinishCallback = null)
+            Anime.PlayType playType=Anime.PlayType.Once, float Speed = 1f, AnimeCallback onFinishCallback = null)
         {
-            AnimeOption animeOption = CreateAnimeOption(Serial, Direction, ActionType, Infinity, Speed, onFinishCallback);
-            if (animeOption == null) return this;
-            _animeQueue.Enqueue(animeOption);
+            AnimeOption animeOption = CreateAnimeOption(Serial, Direction, ActionType, playType, Speed, onFinishCallback);
+            if (animeOption == null)
+            {
+                if (onFinishCallback != null) onFinishCallback(ActionType);
+                return this;
+            }
+            if (_animeQueue.Count == 0)
+            {
+                _play(animeOption);
+            }
+            else
+            {
+                _animeQueue.Enqueue(animeOption);    
+            }
+            
             return this;
         }
         
+        //加入链式动画播放队列
+        public AnimePlayer nextPlay(Anime.DirectionType Direction, Anime.ActionType ActionType,
+            Anime.PlayType playType=Anime.PlayType.Once, float Speed = 1f, AnimeCallback onFinishCallback = null)
+        {
+            return nextPlay(_currentSerial, Direction, ActionType, playType, Speed, onFinishCallback);
+        }
+        
         //更新计算
         private void Update()
         {
             float now = Time.time * 1000;
-            if (_currentAnime != null && (now - _timer) >= _currentAnime.FrameRate) UpdateFrame();
+            if (_currentAnime != null && (now - _timer - _delay) >= _currentAnime.FrameRate) UpdateFrame();
         }
 
         //更新帧
         private void UpdateFrame()
         {
+            _delay = 0;
             if (!isPlayable || _frames.Length == 0) return;
             
             _currentFrame++;
@@ -259,23 +416,36 @@ namespace CGTool
             //动画结束
             if (_currentFrame >= _currentAnime.AnimeDetail.FrameCount)
             {
-                if(_currentAnime.onFinishCallback!=null) _currentAnime.onFinishCallback();
+                if(_currentAnime.onFinishCallback!=null) _currentAnime.onFinishCallback(_currentAnime.actionType);
                 //循环播放
-                if (_currentAnime.Infinity)
+                if (_currentAnime.playType == Anime.PlayType.Loop)
                 {
                     _currentFrame = 0;
-                }
-                //播放下一个动画
-                else if(_animeQueue.Count>0)
+                }else if (_currentAnime.playType == Anime.PlayType.Once || _currentAnime.playType == Anime.PlayType.OnceAndDestroy)
                 {
-                    AnimeOption animeOption = _animeQueue.Dequeue();
-                    _play(animeOption);
-                    return;
+                    if (_currentAnime.playType == Anime.PlayType.OnceAndDestroy)
+                    {
+                        _spriteRenderer.sprite = null;
+                        _imageRenderer.sprite = null;
+                        _rectTransform.sizeDelta = Vector2.zero;
+                        // gameObject.SetActive(false);
+                    }
+                    //播放下一个动画
+                    if(_animeQueue.Count>0)
+                    {
+                        AnimeOption animeOption = _animeQueue.Dequeue();
+                        _play(animeOption);
+                        return;
+                    }else
+                    {
+                        isPlayable = false;
+                        return;
+                    }
                 }
             }
             
             //问题帧自动跳过
-            if (_frames[_currentFrame] == null) return;
+            if (_currentFrame<_frames.Length && _frames[_currentFrame] == null) return;
             //自动偏移
             // float graphicWidth = _frames[_currentFrame].Sprite.rect.width;
             // float graphicHeight = _frames[_currentFrame].Sprite.rect.height;
@@ -285,12 +455,36 @@ namespace CGTool
             //根据当前帧Sprite动态调整对象大小
             float width = _frames[_currentFrame].Sprite.rect.width * 1f;
             float height = _frames[_currentFrame].Sprite.rect.height * 1f;
+
+            if (isRenderByImage)
+            {
+                _imageRenderer.sprite = _frames[_currentFrame].Sprite;
+                _imageRenderer.SetNativeSize();
+                Vector3 pos = Vector3.zero;
+                pos.x = _frames[_currentFrame].GraphicInfo.OffsetX;
+                pos.y = -_frames[_currentFrame].GraphicInfo.OffsetY;
+                _rectTransform.localPosition = pos;
+                _rectTransform.pivot = new Vector2(0f,1f);
+            }
+            else
+            {
+                _spriteRenderer.sprite = _frames[_currentFrame].Sprite;
+                _rectTransform.sizeDelta = new Vector2(width, height);
+                _spriteRenderer.size = new Vector2(width, height);
+                _rectTransform.pivot = new Vector2(0.5f,0f);
+                _rectTransform.localPosition = Vector3.zero;
+            }
+            
+            // Vector2 offset = Vector2.zero;
+            // offset.x += -(_frames[_currentFrame].GraphicInfo.OffsetX * 1f) / _frames[_currentFrame].GraphicInfo.Width;
+            // offset.y -= (-_frames[_currentFrame].GraphicInfo.OffsetY * 1f) / _frames[_currentFrame].GraphicInfo.Height;
+            
+            // _rectTransform.pivot = offset;
+            
+            // pos.x = (width + _frames[_currentFrame].GraphicInfo.OffsetX)/1f;
+            // pos.y = (height + _frames[_currentFrame].GraphicInfo.OffsetY)/1f;
+            
             
-            _spriteRenderer.sprite = 
-                _frames[_currentFrame].Sprite;
-            _rectTransform.sizeDelta = new Vector2(width, height);
-            _spriteRenderer.size = new Vector2(width, height);
-            _rectTransform.pivot = new Vector2(0.5f,0f);
             
             // 2D碰撞器自动调整,但是动态碰撞器反而会导致重叠大物体选中效果不稳定,效果不如固定大小碰撞器好
             // if (_boxCollider2D != null)

CGTool/AudioTool.cs

@@ -0,0 +1,352 @@
+/**
+ * 魔力宝贝图档解析脚本 - CGTool
+ * 
+ * @Author  HonorLee (dev@honorlee.me)
+ * @Version 1.0 (2023-08-26)
+ * @License GPL-3.0
+ *
+ * AudioTool.cs 音频工具
+ * 本工具用于加载音频AudioClip，音频文件位于Assets/Resources/Audio目录下并使用Resources.Load加载
+ * 请将Crossgate的音频目录bgm、se拷贝到Assets/Resources/Audio目录下
+ * 如有其他需要可调整加载方式
+ */
+using System.Collections.Generic;
+using System.IO;
+using UnityEngine;
+
+namespace CGTool
+{
+    public static class AudioTool
+    {
+
+        // 背景音频缓存
+        private static Dictionary<int, AudioClip> _bgmDic = new Dictionary<int, AudioClip>();
+        // 声效音频缓存
+        private static Dictionary<int, AudioClip> _effectDic = new Dictionary<int, AudioClip>();
+
+        public enum Type
+        {
+            BGM,
+            EFFECT
+        }
+        // 获取指定类型、编号的音频AudioClip
+        public static AudioClip GetAudio(Type type, int id)
+        {
+            AudioClip audioClip;
+            Dictionary<int,AudioClip> dic = type == Type.BGM ? _bgmDic : _effectDic;
+            if (dic.TryGetValue(id, out audioClip))
+            {
+                return audioClip;
+            }
+            else
+            {
+                Dictionary<int,string> map = type == Type.BGM ? _bgmMap : _effectMap;
+                if(map.TryGetValue(id, out string audioPath))
+                {
+                    audioClip = Resources.Load<AudioClip>(audioPath);
+                    return audioClip;
+                }
+                else
+                {
+                    // Debug.LogError("Audio not found: " + id);
+                }
+            }
+
+            return null;
+        }
+
+        private static Dictionary<int, string> _bgmMap = new Dictionary<int, string>()
+        {
+            [200] = "Audio/bgm/cgbgm_m0",
+            [201] = "Audio/bgm/cgbgm_m1",
+            [202] = "Audio/bgm/cgbgm_m2",
+            [203] = "Audio/bgm/cgbgm_m3",
+            [204] = "Audio/bgm/cgbgm_m4",
+            [209] = "Audio/bgm/cgbgm_f0",
+            [210] = "Audio/bgm/cgbgm_f1",
+            [211] = "Audio/bgm/cgbgm_f2",
+            [212] = "Audio/bgm/cgbgm_d0",
+            [213] = "Audio/bgm/cgbgm_d1",
+            [214] = "Audio/bgm/cgbgm_d2",
+            [215] = "Audio/bgm/cgbgm_d3",
+            [216] = "Audio/bgm/cgbgm_d4",
+            [205] = "Audio/bgm/cgbgm_b0",
+            [206] = "Audio/bgm/cgbgm_b1",
+            [207] = "Audio/bgm/cgbgm_b2",
+            [208] = "Audio/bgm/cgbgm_b3",
+            [217] = "Audio/bgm/cgbgm_t0",
+            [219] = "Audio/bgm/exbgm_s0",
+            [220] = "Audio/bgm/exbgm_f0",
+            [221] = "Audio/bgm/exbgm_m0",
+            [222] = "Audio/bgm/v2bgm_f0",
+            [223] = "Audio/bgm/v2bgm_m0",
+            [224] = "Audio/bgm/v2bgm_ex",
+            [225] = "Audio/bgm/v2bgm_ex",
+            [226] = "Audio/bgm/puk2_battle1",
+            [227] = "Audio/bgm/puk2_battle2",
+            [228] = "Audio/bgm/puk2_field1",
+            [229] = "Audio/bgm/puk2_mati",
+            [230] = "Audio/bgm/puk2_sinden",
+            [231] = "Audio/bgm/puk2_yama",
+            [232] = "Audio/bgm/puk2_haikyo",
+            [233] = "Audio/bgm/puk2_m_town",
+            [234] = "Audio/bgm/puk2_OP",
+            [235] = "Audio/bgm/puk3_battle1",
+            [236] = "Audio/bgm/puk3_battle2",
+            [237] = "Audio/bgm/puk3_dungeon",
+            [238] = "Audio/bgm/puk3_kame",
+            [239] = "Audio/bgm/puk3_kujira",
+            [240] = "Audio/bgm/puk3_kumo",
+            [241] = "Audio/bgm/puk3_love",
+            [242] = "Audio/bgm/puk3_playerbattle",
+            [243] = "Audio/bgm/PUK3_title",
+        };
+
+        private static Dictionary<int, string> _effectMap = new Dictionary<int, string>()
+        {
+            [1] = "Audio/se/cgnat00",
+            [2] = "Audio/se/cgnat01",
+            [3] = "Audio/se/cgnat02",
+            [4] = "Audio/se/cgnat03",
+            [5] = "Audio/se/cgnat04",
+            [6] = "Audio/se/cgnat05a",
+            [7] = "Audio/se/cgnat05b",
+            [8] = "Audio/se/cgnat06a",
+            [9] = "Audio/se/cgnat06b",
+            [10] = "Audio/se/cgnat07",
+            [11] = "Audio/se/cgnat08",
+            [12] = "Audio/se/cgnat09",
+            [13] = "Audio/se/cgnat10",
+            [14] = "Audio/se/cgnat11",
+            [15] = "Audio/se/exnat00",
+            [16] = "Audio/se/v2mon150a",
+            [17] = "Audio/se/34sand_clock",
+            [18] = "Audio/se/35sand_clock",
+            [19] = "Audio/se/36wind",
+            [20] = "Audio/se/37bird",
+            [21] = "Audio/se/puk3_Wind01",
+            [22] = "Audio/se/puk3_Wind02",
+            [23] = "Audio/se/puk3_Wind03",
+            [24] = "Audio/se/puk3_gaya01",
+            [25] = "Audio/se/puk3_drop01",
+            [26] = "Audio/se/puk3_drop02",
+            [51] = "Audio/se/cgsys00",
+            [52] = "Audio/se/cgsys01",
+            [53] = "Audio/se/cgsys02",
+            [54] = "Audio/se/cgsys03",
+            [55] = "Audio/se/cgsys04",
+            [56] = "Audio/se/cgsys05",
+            [57] = "Audio/se/cgsys06",
+            [58] = "Audio/se/cgsys07",
+            [59] = "Audio/se/cgsys08",
+            [60] = "Audio/se/cgsys09",
+            [61] = "Audio/se/cgsys10a",
+            [62] = "Audio/se/cgsys10b",
+            [63] = "Audio/se/cgsys11",
+            [64] = "Audio/se/cgsys12",
+            [65] = "Audio/se/cgsys13a",
+            [66] = "Audio/se/cgsys13b",
+            [67] = "Audio/se/cgsys13c",
+            [68] = "Audio/se/cgsys14",
+            [69] = "Audio/se/cgsys15",
+            [71] = "Audio/se/cgsys17",
+            [72] = "Audio/se/cgsys18",
+            [73] = "Audio/se/cgsys19",
+            [74] = "Audio/se/cgsys20",
+            [75] = "Audio/se/cgsys21",
+            [76] = "Audio/se/cgsys22",
+            [77] = "Audio/se/cgsys23",
+            [78] = "Audio/se/cgsys24",
+            [79] = "Audio/se/cgsys25",
+            [101] = "Audio/se/cgply00a",
+            [102] = "Audio/se/cgply00b",
+            [103] = "Audio/se/cgply01a",
+            [104] = "Audio/se/cgply01b",
+            [105] = "Audio/se/cgply02a",
+            [106] = "Audio/se/cgply02b",
+            [107] = "Audio/se/cgply03a",
+            [108] = "Audio/se/cgply03b",
+            [109] = "Audio/se/cgply04a",
+            [110] = "Audio/se/cgply04b",
+            [111] = "Audio/se/cgply05a",
+            [112] = "Audio/se/cgply05b",
+            [113] = "Audio/se/cgply06a1",
+            [114] = "Audio/se/cgply06b1",
+            [115] = "Audio/se/cgply06a2",
+            [116] = "Audio/se/cgply06b2",
+            [117] = "Audio/se/cgply07a",
+            [118] = "Audio/se/cgply07b",
+            [131] = "Audio/se/cgply06a2",
+            [132] = "Audio/se/cgply06b2",
+            [133] = "Audio/se/cgply11a",
+            [134] = "Audio/se/cgply11b",
+            [135] = "Audio/se/cgply12a",
+            [136] = "Audio/se/cgply12b",
+            [137] = "Audio/se/cgply13a",
+            [138] = "Audio/se/cgply13b",
+            [139] = "Audio/se/cgply14a",
+            [140] = "Audio/se/cgply14b",
+            [141] = "Audio/se/cgply15",
+            [142] = "Audio/se/cgply16",
+            [143] = "Audio/se/cgply17",
+            [147] = "Audio/se/cgply00a",
+            [150] = "Audio/se/cgply11b",
+            [151] = "Audio/se/cgmon00a",
+            [152] = "Audio/se/cgmon00b",
+            [153] = "Audio/se/cgmon01",
+            [154] = "Audio/se/cgmon02a",
+            [155] = "Audio/se/cgmon02b",
+            [156] = "Audio/se/cgmon03b",
+            [157] = "Audio/se/cgmon10",
+            [158] = "Audio/se/cgmon20",
+            [159] = "Audio/se/cgmon24",
+            [160] = "Audio/se/cgmon30",
+            [161] = "Audio/se/cgmon31",
+            [162] = "Audio/se/cgmon41",
+            [163] = "Audio/se/cgmon43",
+            [164] = "Audio/se/cgmon50a",
+            [165] = "Audio/se/cgmon50b",
+            [166] = "Audio/se/cgmon51",
+            [167] = "Audio/se/cgmon52",
+            [168] = "Audio/se/cgmon60",
+            [169] = "Audio/se/cgmon61",
+            [171] = "Audio/se/cgmon63",
+            [172] = "Audio/se/cgmon90",
+            [173] = "Audio/se/cgmon91",
+            [174] = "Audio/se/cgmon92",
+            [175] = "Audio/se/cgmon93",
+            [180] = "Audio/se/cgmon_bs1",
+            [181] = "Audio/se/cgmon_bs2",
+            [182] = "Audio/se/cgmon_bs3",
+            [183] = "Audio/se/cgmon_bs4",
+            [184] = "Audio/se/cgmon_bh1",
+            [185] = "Audio/se/cgmon_bh2",
+            [186] = "Audio/se/cgmon_bh3",
+            [187] = "Audio/se/cgmon_bh4",
+            [190] = "Audio/se/cgmon_m00",
+            [191] = "Audio/se/cgmon_m01",
+            [192] = "Audio/se/cgmon_m02",
+            [198] = "Audio/se/cgmon_sample01",
+            [199] = "Audio/se/cgmon_sample02",
+            [200] = "Audio/se/cgmon_sample03",
+            [201] = "Audio/se/cgbtl00",
+            [202] = "Audio/se/cgbtl01",
+            [204] = "Audio/se/cgbtl03",
+            [205] = "Audio/se/cgbtl04",
+            [206] = "Audio/se/cgbtl05",
+            [207] = "Audio/se/cgbtl06",
+            [208] = "Audio/se/cgbtl07",
+            [209] = "Audio/se/cgbtl08",
+            [210] = "Audio/se/cgbtl09",
+            [211] = "Audio/se/cgbtl10",
+            [212] = "Audio/se/cgbtl11",
+            [213] = "Audio/se/cgbtl12",
+            [214] = "Audio/se/cgbtl13",
+            [215] = "Audio/se/cgbtl14",
+            [216] = "Audio/se/cgbtl15",
+            [217] = "Audio/se/cgbtl16",
+            [218] = "Audio/se/cgbtl17",
+            [251] = "Audio/se/cgefc00",
+            [252] = "Audio/se/cgefc01",
+            [253] = "Audio/se/cgefc02",
+            [254] = "Audio/se/cgefc03",
+            [255] = "Audio/se/cgefc04",
+            [256] = "Audio/se/cgefc05",
+            [257] = "Audio/se/cgefc06",
+            [258] = "Audio/se/cgefc07",
+            [259] = "Audio/se/cgefc08",
+            [260] = "Audio/se/cgefc09",
+            [261] = "Audio/se/cgefc10",
+            [262] = "Audio/se/cgefc11",
+            [263] = "Audio/se/cgefc12",
+            [264] = "Audio/se/cgefc13",
+            [266] = "Audio/se/cgefc15",
+            [267] = "Audio/se/cgefc16",
+            [268] = "Audio/se/cgefc17",
+            [269] = "Audio/se/cgefc18",
+            [270] = "Audio/se/cgefc19",
+            [271] = "Audio/se/cgefc20",
+            [272] = "Audio/se/cgefc21",
+            [273] = "Audio/se/cgefc22",
+            [274] = "Audio/se/cgefc23",
+            [275] = "Audio/se/cgefc24",
+            [276] = "Audio/se/cgefc25",
+            [277] = "Audio/se/cgefc26",
+            [278] = "Audio/se/cgefc27",
+            [279] = "Audio/se/cgefc28",
+            [280] = "Audio/se/cgefc29",
+            [281] = "Audio/se/cgefc30",
+            [282] = "Audio/se/cgefc31",
+            [283] = "Audio/se/cgefc32",
+            [284] = "Audio/se/cgefc33",
+            [285] = "Audio/se/cgefc34",
+            [286] = "Audio/se/cgefc35",
+            [287] = "Audio/se/cgefc36",
+            [288] = "Audio/se/cgefc37a",
+            [289] = "Audio/se/cgefc37b",
+            [290] = "Audio/se/cgefc37c",
+            [291] = "Audio/se/cgefc38",
+            [296] = "Audio/se/v2monex1",
+            [297] = "Audio/se/v2monex2",
+            [298] = "Audio/se/v2monex3",
+            [300] = "Audio/se/v2mon100",
+            [301] = "Audio/se/v2mon110",
+            [302] = "Audio/se/v2mon111a",
+            [303] = "Audio/se/v2mon111b",
+            [304] = "Audio/se/v2mon120",
+            [305] = "Audio/se/v2mon121a",
+            [306] = "Audio/se/v2mon121b",
+            [307] = "Audio/se/v2mon121c",
+            [308] = "Audio/se/v2mon130",
+            [309] = "Audio/se/v2mon140",
+            [310] = "Audio/se/v2mon150a",
+            [311] = "Audio/se/v2mon150b",
+            [312] = "Audio/se/v2mon161",
+            [313] = "Audio/se/v2mon170a",
+            [314] = "Audio/se/v2mon170b",
+            [315] = "Audio/se/v2mon171a",
+            [316] = "Audio/se/v2mon171b",
+            [317] = "Audio/se/v2mon190",
+            [318] = "Audio/se/v2mon191",
+            [319] = "Audio/se/v2monex0",
+            [400] = "Audio/se/01small_amae_new",
+            [401] = "Audio/se/02small_normal",
+            [402] = "Audio/se/02small_normal_new",
+            [403] = "Audio/se/03small_iyaiya",
+            [404] = "Audio/se/03small_iyaiya_new",
+            [405] = "Audio/se/04fish_normal",
+            [406] = "Audio/se/05fish_shout",
+            [407] = "Audio/se/06fish_amae",
+            [408] = "Audio/se/09kame_amae",
+            [409] = "Audio/se/10yagi_shout",
+            [410] = "Audio/se/11yagi_normal",
+            [411] = "Audio/se/12yagi_amae",
+            [412] = "Audio/se/13bird_normal",
+            [413] = "Audio/se/14bird_shout",
+            [414] = "Audio/se/15bird_amae",
+            [415] = "Audio/se/16fish_normal",
+            [416] = "Audio/se/17fish_shout",
+            [417] = "Audio/se/18kame_normal",
+            [418] = "Audio/se/19kame_shout",
+            [419] = "Audio/se/20animal_normal",
+            [420] = "Audio/se/21animal_shout",
+            [421] = "Audio/se/22bird_normal",
+            [422] = "Audio/se/23bird_shout",
+            [423] = "Audio/se/24Monstor",
+            [424] = "Audio/se/25_1_off",
+            [425] = "Audio/se/26ground_on",
+            [426] = "Audio/se/27ground_off",
+            [427] = "Audio/se/28_water_on",
+            [428] = "Audio/se/29_water_of",
+            [429] = "Audio/se/30fire_on",
+            [430] = "Audio/se/31fire_of",
+            [431] = "Audio/se/32_wind_on",
+            [432] = "Audio/se/32_wind_on2",
+            [433] = "Audio/se/33_wind_off",
+            [435] = "Audio/se/36wind",
+            [436] = "Audio/se/37bird",
+            [437] = "Audio/se/38make_gild",
+            [438] = "Audio/se/39levelup",
+        };
+    }
+}

CGTool/CGTool.cs

@@ -12,24 +12,15 @@ using UnityEngine;
 
 namespace CGTool
 {
-    public class CGTool : MonoBehaviour
+    public static class CGTool
     {
-        public readonly static bool DEBUG = true;
         //Bin基础目录
         public readonly static string BaseFolder = System.Environment.CurrentDirectory + "/bin";
         //Palet调色板目录
         public readonly static string PaletFolder = BaseFolder + "/pal";
-        //Datas目录
-        public readonly static string DataFolder = System.Environment.CurrentDirectory + "/data";
         //Map地图文件目录
-        public readonly static string MapFolder = DataFolder + "/map";
-        
-        //日志工具
-        // public readonly static Util.Logger Logger = new Util.Logger("CGTool", DEBUG);
+        public readonly static string MapFolder = BaseFolder + "/map";
 
-        public static bool ShowMapUnitName = true;
-        
-        
         //初始化CGTool
         public static void Init()
         {
@@ -37,12 +28,14 @@ namespace CGTool
             for (int i = 0; i < 16; i++) Palet.GetPalet(i);
             
             //初始化加载并缓存GraphicInfo配置表
-            for (int i = 0; i < 2; i++) GraphicInfo.GetGraphicInfo(i);
-
-            //初始化加载动画序列信息
-            Anime.GetAnimeInfo(0);
-            Anime.GetAnimeInfo(105000);
+            GraphicInfo.Init();
+            
+            //初始化图档解析器
+            Graphic.Init();
             
+            //初始化加载动画序列信息
+            Anime.Init();
+
             //地图索引初始化
             Map.Init();
 

CGTool/Graphic.cs

@@ -12,6 +12,12 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using CGR;
+using Unity.Burst;
+using Unity.Collections;
+using Unity.Jobs;
+using Unity.Mathematics;
 using UnityEngine;
 
 namespace CGTool
@@ -53,18 +59,62 @@ namespace CGTool
         // private static Dictionary<int, Dictionary<uint, Dictionary<int, GraphicData>>> _serialCache =
         //     new Dictionary<int, Dictionary<uint, Dictionary<int, GraphicData>>>();
         
-        private static List<string> _graphicPaths = new List<string>()
+        private static Dictionary<int,string> _graphicVersionPrefix = new Dictionary<int, string>()
         {
             //龙之沙漏 之前版本前图档数据
-            "Graphic_66.bin",
+            {0,"Graphic_"},
             //龙之沙漏 版本图档数据
-            "GraphicEx_5.bin"
+            {1,"GraphicEx_"}
         };
         
+        private static List<string> _graphicPaths = new List<string>();
+        
+        //地图地面Texture合批
+        //地图图档PaletIndex -> MapS 索引
+        // private static Dictionary<int,int> _mapPaletMap = new Dictionary<int, int>();
+        //地图图档Serial -> Palet ->MapIndex 索引
+        private static Dictionary<int,Dictionary<int,int>> _mapSerialMap = new Dictionary<int,Dictionary<int,int>>();
+        //地图图档MapIndex -> Palet -> Texture 索引
+        private static Dictionary<int,Dictionary<int,Texture2D>> _mapTextureMap = new Dictionary<int,Dictionary<int,Texture2D>>();
+        //地图图档MapIndex -> MapIndexList 索引库存,索引库容量为 2048x2048尺寸Texture可存储64x48地面图档的数量,即 2048/48(42) * 2048/64(32) ~= 1344
+        //解压地面图档时动态分配索引库存 MapIndex -> Count
+        private static List<int> _mapIndexLib = new List<int>();
+        //Graphic字节读取器缓存
+        private static BinaryReader[] _fileReaderCache = new BinaryReader[_graphicVersionPrefix.Count];
+
+        // 初始化
+        public static void Init()
+        {
+            //查找目录文件
+            DirectoryInfo directoryInfo = new DirectoryInfo(CGTool.BaseFolder);
+            FileInfo[] files = directoryInfo.GetFiles();
+            for (int i = 0; i < _graphicVersionPrefix.Count; i++)
+            {
+                foreach (FileInfo file in files)
+                {
+                    if (file.Name.StartsWith(_graphicVersionPrefix[i]))
+                    {
+                        _graphicPaths.Add(file.Name);
+                        BinaryReader fileReader;
+                        string fileName = _graphicPaths[i];
+                        FileInfo fileInfo = new FileInfo(CGTool.BaseFolder + "/" + fileName);
+                        if (!fileInfo.Exists) return;
+                        //创建流读取器
+                        FileStream fileStream = fileInfo.OpenRead();
+                        fileReader = new BinaryReader(fileStream);
+                        _fileReaderCache[i] = fileReader;
+                        break;
+                    }    
+                }
+                
+            }
+        }
+
         //根据地址获取GraphicData
-        public static GraphicData GetGraphicData(GraphicInfoData graphicInfoData,int PaletIndex=0)
+        public static GraphicData GetGraphicData(GraphicInfoData graphicInfoData,int PaletIndex=0,bool asMapGround=false)
         {
             GraphicData graphicData = null;
+
             //缓存数据
             if (_cache.ContainsKey(graphicInfoData.Version))
             {
@@ -77,40 +127,173 @@ namespace CGTool
                 }
             }
             //无缓存则加载数据
-            if (graphicData == null) graphicData = _loadGraphicData(graphicInfoData, PaletIndex);
+            if (graphicData == null) graphicData = _loadGraphicData(graphicInfoData, PaletIndex, asMapGround);
             
             return graphicData;
         }
 
-        //初始化加载GraphicInfo
-        private static GraphicData _loadGraphicData(GraphicInfoData graphicInfoData, int PaletIndex = 0)
+        //初始化加载GraphicData
+        private static GraphicData _loadGraphicData(GraphicInfoData graphicInfoData, int PaletIndex = 0,
+            bool asMapGround = false)
         {
-            //查找图档文件
-            string fileName = _graphicPaths[graphicInfoData.Version];
-            FileInfo file = new FileInfo(CGTool.BaseFolder + "/" + fileName);
-            if (!file.Exists) return null;
+            GraphicData graphicData = new GraphicData();
 
-            //创建流读取器
-            FileStream fileStream = file.OpenRead();
-            BinaryReader fileReader = new BinaryReader(fileStream);
+            //获取图像数据
+            List<Color32> pixels = UnpackGraphic(graphicInfoData, PaletIndex);
+            graphicData.PrimaryColor = pixels.Last();
+            pixels.RemoveAt(pixels.Count - 1);
 
-            //获取调色板
-            List<Color32> palet = Palet.GetPalet(PaletIndex);
+            //直接通过Texture2D做偏移,并转为Sprite的偏移量
+            Vector2 offset = new Vector2(0f, 1f);
+            offset.x += -(graphicInfoData.OffsetX * 1f) / graphicInfoData.Width;
+            offset.y -= (-graphicInfoData.OffsetY * 1f) / graphicInfoData.Height;
+            
+            //创建Texture2D对象
+            Texture2D texture2D;
+            Sprite sprite;
 
-            GraphicData graphicData = new GraphicData();
+            texture2D = new Texture2D((int) graphicInfoData.Width, (int) graphicInfoData.Height,
+                TextureFormat.RGBA4444, false, false);
+            
+            texture2D.filterMode = FilterMode.Point;
+            texture2D.SetPixels32(pixels.ToArray());
+            // texture2D.LoadRawTextureData(rawTextureData);
+            texture2D.Apply();
+            
+            sprite = Sprite.Create(texture2D, new Rect(0, 0, texture2D.width, texture2D.height), offset, 1,1,SpriteMeshType.FullRect);
+
+
+            //写入数据
+            graphicData.Version = graphicInfoData.Version;
+            graphicData.Index = graphicInfoData.Index;
+            graphicData.MapSerial = graphicInfoData.Serial;
+            graphicData.Width = graphicInfoData.Width;
+            graphicData.Height = graphicInfoData.Height;
+            graphicData.OffsetX = graphicInfoData.OffsetX;
+            graphicData.OffsetY = graphicInfoData.OffsetY;
+            graphicData.PaletIndex = PaletIndex;
+            graphicData.Sprite = sprite;
+
+            //缓存
+            if (!_cache.ContainsKey(graphicInfoData.Version))
+                _cache.Add(graphicInfoData.Version, new Dictionary<uint, Dictionary<int, GraphicData>>());
+            if(!_cache[graphicInfoData.Version].ContainsKey(graphicInfoData.Addr)) _cache[graphicInfoData.Version].Add(graphicInfoData.Addr,new Dictionary<int, GraphicData>());
+            if (!_cache[graphicInfoData.Version][graphicInfoData.Addr].ContainsKey(PaletIndex))
+                _cache[graphicInfoData.Version][graphicInfoData.Addr].Add(PaletIndex, graphicData);
+            
+            return graphicData;
+        }
+    
+        //地图sprite缓存  <地图索引,<调色板索引,Sprite>>
+        // private static Dictionary<int,Dictionary<int,Dictionary<int,GraphicData>>> _mapSpriteMap = new Dictionary<int, Dictionary<int, Dictionary<int, GraphicData>>>();
+
+        //预备地图缓存
+        public static Dictionary<int, GraphicData> PrepareMapGroundTexture(int MapID, int PaletIndex,
+            List<GraphicInfoData> groundInfos)
+        {
+            //如果已经缓存过,则直接返回
+            // if(_mapSpriteMap.ContainsKey(MapID) && _mapSpriteMap[MapID].ContainsKey(PaletIndex)) return _mapSpriteMap[MapID][PaletIndex];
+            //如果没有缓存过,则创建缓存
+            // if(!_mapSpriteMap.ContainsKey(MapID)) _mapSpriteMap.Add(MapID,new Dictionary<int, Dictionary<int, GraphicData>>());
+            Dictionary<int, GraphicData> graphicDataDic = new Dictionary<int, GraphicData>();
+            // _mapSpriteMap[MapID].Add(PaletIndex, graphicDataDic);
+            
+            List<GraphicData> graphicDatas = new List<GraphicData>();
+            Texture2D texture2D = null;
+            
+            for (var i = 0; i < groundInfos.Count; i++)
+            {
+                //每1344个图像合并一次,即不超过2048*2048尺寸
+                if (i % 1344 == 0)
+                {
+                    //合并
+                    if (i != 0) Combine(texture2D, graphicDatas);
+                    
+                    //清空
+                    graphicDatas.Clear();
+                    int height = 2048;
+
+                    if (i + 1344 > groundInfos.Count-1)
+                    {
+                        height = Mathf.CeilToInt((groundInfos.Count - i) / 32f) * 48;
+                    }
+                    texture2D = new Texture2D(2048, height, TextureFormat.RGBA4444, false, true);
+                    texture2D.filterMode = FilterMode.Point;
+                    //默认填充全透明
+                    Color32[] colors = new Color32[2048 * height];
+                    for (int j = 0; j < colors.Length; j++)
+                    {
+                        colors[j] = new Color32(0,0,0,0);
+                    }
+                    texture2D.SetPixels32(colors);
+                }
+                
+                GraphicInfoData graphicInfoData = groundInfos[i];
+                GraphicData graphicData = new GraphicData();
+                
+                //获取图像数据
+                List<Color32> pixels = UnpackGraphic(graphicInfoData, PaletIndex);
+                graphicData.PrimaryColor = pixels.Last();
+                pixels.RemoveAt(pixels.Count - 1);
+                
+                int x = i % 32 * 64;
+                int y = i / 32 * 48;
+
+                texture2D.SetPixels32(x, y, (int) graphicInfoData.Width, (int) graphicInfoData.Height,
+                    pixels.ToArray());
+
+                //写入数据
+                graphicData.Version = graphicInfoData.Version;
+                graphicData.Index = graphicInfoData.Index;
+                graphicData.MapSerial = graphicInfoData.Serial;
+                graphicData.Width = graphicInfoData.Width;
+                graphicData.Height = graphicInfoData.Height;
+                graphicData.OffsetX = graphicInfoData.OffsetX;
+                graphicData.OffsetY = graphicInfoData.OffsetY;
+                graphicData.PaletIndex = PaletIndex;
+                
+                
+                graphicDatas.Add(graphicData);
+            }
+            
+            //最后一次合并
+            if (graphicDatas.Count > 0) Combine(texture2D, graphicDatas);
+
+            void Combine(Texture2D texture2D,List<GraphicData> graphicDatas)
+            {
+                texture2D.Apply();
+                for (var i = 0; i < graphicDatas.Count; i++)
+                {
+                    GraphicData graphicDataPiece = graphicDatas[i];
+                    //直接通过Texture2D做偏移,并转为Sprite的偏移量
+                    Vector2 offset = new Vector2(0f, 1f);
+                    offset.x += -(graphicDataPiece.OffsetX * 1f) / graphicDataPiece.Width;
+                    offset.y -= (-graphicDataPiece.OffsetY * 1f) / graphicDataPiece.Height;
+                        
+                    int X = i % 32 * 64;
+                    int Y = i / 32 * 48;
+                        
+                    Sprite sprite = Sprite.Create(texture2D, new Rect(X, Y, (int)graphicDataPiece.Width, (int)graphicDataPiece.Height),offset, 1, 1, SpriteMeshType.FullRect);
+                    graphicDataPiece.Sprite = sprite;
+
+                    graphicDataDic.Add((int) graphicDataPiece.MapSerial, graphicDataPiece);
+                }
+            }
+
+            return graphicDataDic;
+        }
+        private static List<Color32> UnpackGraphic(GraphicInfoData graphicInfoData,int PaletIndex){
             List<Color32> pixels = new List<Color32>();
+            //获取调色板
+            List<Color32> palet = Palet.GetPalet(PaletIndex);
 
             //调整流指针
-            fileStream.Position = graphicInfoData.Addr;
+            BinaryReader fileReader = _fileReaderCache[graphicInfoData.Version];
+            fileReader.BaseStream.Position = graphicInfoData.Addr;
 
             //读入目标字节集
             byte[] Content = fileReader.ReadBytes((int) graphicInfoData.Length);
 
-            //关闭文件链接
-            fileReader.Dispose();
-            fileReader.Close();
-            fileStream.Close();
-
             //读取缓存字节集
             BinaryReader contentReader = new BinaryReader(new MemoryStream(Content));
 
@@ -122,237 +305,230 @@ namespace CGTool
             uint Height = contentReader.ReadUInt32();
             uint Length = contentReader.ReadUInt32();
 
+            
+            //数据长度
+            uint contentLen = Length - 16;
+            int pixelLen = (int) (graphicInfoData.Width * graphicInfoData.Height);
+
+            int[] paletIndex;
+            if (graphicInfoData.UnpackedPaletIndex == null)
+            {
+                //解压数据
+                byte[] contentBytes = contentReader.ReadBytes((int) contentLen);
+                NativeArray<byte> bytes = new NativeArray<byte>((int) contentBytes.Length, Allocator.TempJob);
+                
+                bytes.CopyFrom(contentBytes);
+
+                // Debug.Log(contentBytes.Length + "   " + bytes.Length);
+                NativeArray<int> colorIndexs =
+                    new NativeArray<int>(pixelLen, Allocator.TempJob);
+
+
+                DecompressJob decompressJob = new DecompressJob()
+                {
+                    bytes = bytes,
+                    compressd = Version != 0,
+                    colorIndexs = colorIndexs
+                };
+                // decompressJob.Execute();
+                decompressJob.Schedule().Complete();
+                bytes.Dispose();
+                paletIndex = colorIndexs.ToArray();
+                graphicInfoData.UnpackedPaletIndex = paletIndex;
+                colorIndexs.Dispose();
+            }
+            else
+            {
+                paletIndex = graphicInfoData.UnpackedPaletIndex;
+            }
+
+            //释放连接
+            contentReader.Dispose();
+            contentReader.Close();
+            
             //主色调色值
             int r = 0;
             int g = 0;
             int b = 0;
-            //数据长度
-            uint contentLen = Length - 16;
-            //非压缩型数据
-            if (Version == 0)
+            foreach (int index in paletIndex)
             {
-                while (true)
+                // Debug.Log(index);
+                Color32 color32 = palet[index];
+                pixels.Add(color32);
+                r += color32.r;
+                g += color32.g;
+                b += color32.b;
+            }
+            //主色调计算及提亮
+            r = r / pixels.Count * 3;
+            g = g / pixels.Count * 3;
+            b = b / pixels.Count * 3;
+            if (r > 255) r = 255;
+            if (g > 255) g = 255;
+            if (b > 255) b = 255;
+
+            int len = (int) (graphicInfoData.Width * graphicInfoData.Height);
+
+            if (pixels.Count != len)
+            {
+                if (pixels.Count > len)
                 {
-                    Color32 color32;
-                    try
-                    {
-                        color32 = palet[contentReader.ReadByte()];
-                    }
-                    catch (Exception e)
-                    {
-                        break;
-                    }
-                    pixels.Add(color32);
-                    r += color32.r;
-                    g += color32.g;
-                    b += color32.b;
+                    pixels = pixels.GetRange(0, len);
+                }
+                else
+                {
+                    Color32[] temc = new Color32[len - pixels.Count];
+                    ArrayList.Repeat(Color.clear, len - pixels.Count).CopyTo(temc);
+                    pixels.AddRange(temc);
+                }
+            }
+
+            
+            //主色调加入最后
+            pixels.Add(new Color32((byte) r, (byte) g, (byte) b, 255));
+
+                
+            return pixels;
+        }
+    }
+    
+    
+    //解压缩交给IJob处理
+    [BurstCompile]
+    public struct DecompressJob : IJob
+    {
+        [ReadOnly]
+        public NativeArray<byte> bytes;
+        public bool compressd;
+        public NativeArray<int> colorIndexs;
+    
+        private int _maxIndex;
+        private int _index;
+        private int _colorIndex;
+    
+        private int NextByte()
+        {
+            _index++;
+            if (_index > _maxIndex) return -1;
+            return bytes[_index];
+        }
+        private void AddColorIndex(int index)
+        {
+            colorIndexs[_colorIndex] = index;
+            _colorIndex++;
+        }
+        [BurstCompile]
+        public void Execute()
+        {
+            _maxIndex = bytes.Length - 1;
+            _index = -1;
+            _colorIndex = 0;
+            
+            if (!compressd)
+            {
+                while (_index<=_maxIndex)
+                {
+                    int index = NextByte();
+                    if(index==-1) break;
+                    AddColorIndex(index);
                 }
             }
             else
                 //压缩型数据解压
             {
-                int count = 0;
-                while (true)
+                // int count = 0;
+                while (_index<=_maxIndex)
                 {
-                    count++;
-                    int head;
-                    try
-                    {
-                        head = contentReader.ReadByte();
-                    }
-                    catch (Exception e)
-                    {
-                        break;
-                    }
-                    
+                    // count++;
+                    int head = NextByte();
+                    if(head==-1) break;
+
                     int repeat = 0;
-                    Color32 color32;
                     if (head < 0x10)
                     {
                         repeat = head;
                         for (var i = 0; i < repeat; i++)
                         {
-                            color32 = palet[contentReader.ReadByte()];
-                            r += color32.r;
-                            g += color32.g;
-                            b += color32.b;
-                            pixels.Add(color32);
+                            AddColorIndex(NextByte());
                         }
-
+    
                     }
                     else if (head < 0x20)
                     {
-                        repeat = head % 0x10 * 0x100 + contentReader.ReadByte();
+                        repeat = head % 0x10 * 0x100 + NextByte();
                         for (var i = 0; i < repeat; i++)
                         {
-                            color32 = palet[contentReader.ReadByte()];
-                            r += color32.r;
-                            g += color32.g;
-                            b += color32.b;
-                            pixels.Add(color32);
+                            AddColorIndex(NextByte());
                         }
-
+    
                     }
                     else if (head < 0x80)
                     {
-                        repeat = head % 0x20 * 0x10000 + contentReader.ReadByte() * 0x100 + contentReader.ReadByte();
+                        repeat = head % 0x20 * 0x10000 + NextByte() * 0x100 + NextByte();
                         for (var i = 0; i < repeat; i++)
                         {
-                            color32 = palet[contentReader.ReadByte()];
-                            r += color32.r;
-                            g += color32.g;
-                            b += color32.b;
-                            pixels.Add(color32);
+                            AddColorIndex(NextByte());
                         }
-
+    
                     }
                     else if (head < 0x90)
                     {
                         repeat = head % 0x80;
-                        color32 = palet[contentReader.ReadByte()];
+                        int index = NextByte();
                         for (var i = 0; i < repeat; i++)
                         {
-                            r += color32.r;
-                            g += color32.g;
-                            b += color32.b;
-                            pixels.Add(color32);
+                            AddColorIndex(index);
                         }
-
+    
                     }
                     else if (head < 0xa0)
                     {
-                        color32 = palet[contentReader.ReadByte()];
-                        repeat = head % 0x90 * 0x100 + contentReader.ReadByte();
+                        int index = NextByte();
+                        repeat = head % 0x90 * 0x100 + NextByte();
                         for (var i = 0; i < repeat; i++)
                         {
-                            r += color32.r;
-                            g += color32.g;
-                            b += color32.b;
-                            pixels.Add(color32);
+                            AddColorIndex(index);
                         }
-
+    
                     }
                     else if (head < 0xc0)
                     {
-                        color32 = palet[contentReader.ReadByte()];
-                        repeat = head % 0xa0 * 0x10000 + contentReader.ReadByte() * 0x100 + contentReader.ReadByte();
+                        int index = NextByte();
+                        repeat = head % 0xa0 * 0x10000 + NextByte() * 0x100 + NextByte();
                         for (var i = 0; i < repeat; i++)
                         {
-                            r += color32.r;
-                            g += color32.g;
-                            b += color32.b;
-                            pixels.Add(color32);
+                            AddColorIndex(index);
                         }
-
+    
                     }
                     else if (head < 0xd0)
                     {
-                        color32 = Color.clear;
                         repeat = head % 0xc0;
                         for (var i = 0; i < repeat; i++)
                         {
-                            r += color32.r;
-                            g += color32.g;
-                            b += color32.b;
-                            pixels.Add(color32);
+                            AddColorIndex(256);
                         }
-
+    
                     }
                     else if (head < 0xe0)
                     {
-                        color32 = Color.clear;
-                        repeat = head % 0xd0 * 0x100 + contentReader.ReadByte();
+                        repeat = head % 0xd0 * 0x100 + NextByte();
                         for (var i = 0; i < repeat; i++)
                         {
-                            r += color32.r;
-                            g += color32.g;
-                            b += color32.b;
-                            pixels.Add(color32);
+                            AddColorIndex(256);
                         }
-
+    
                     }
                     else
                     {
-                        color32 = Color.clear;
-                        repeat = head % 0xe0 * 0x10000 + contentReader.ReadByte() * 0x100 + contentReader.ReadByte();
+                        repeat = head % 0xe0 * 0x10000 + NextByte() * 0x100 + NextByte();
                         for (var i = 0; i < repeat; i++)
                         {
-                            r += color32.r;
-                            g += color32.g;
-                            b += color32.b;
-                            pixels.Add(color32);
+                            AddColorIndex(256);
                         }
                     }
                 }
             }
-
-            //主色调计算及提亮
-            r = r / pixels.Count * 2;
-            g = g / pixels.Count * 2;
-            b = b / pixels.Count * 2;
-            if (r > 255) r = 255;
-            if (g > 255) g = 255;
-            if (b > 255) b = 255;
-            //主色调
-            Color32 primaryColor32 = new Color32((byte) r, (byte) g, (byte) b, 255);
-
-            //释放连接
-            contentReader.Dispose();
-            contentReader.Close();
-
-            //创建Sprite对象
-            Texture2D texture2D = new Texture2D((int) graphicInfoData.Width, (int) graphicInfoData.Height,
-                TextureFormat.RGBA32, false);
-            
-            int len = (int) (graphicInfoData.Width * graphicInfoData.Height);
-            if (pixels.Count != len)
-            {
-                if (pixels.Count > len)
-                {
-                    pixels = pixels.GetRange(0, len);
-                }
-                else
-                {
-                    Color32[] temc = new Color32[len - pixels.Count];
-                    ArrayList.Repeat(Color.clear, len - pixels.Count).CopyTo(temc);
-                    pixels.AddRange(temc);
-                }
-
-            }
-
-            texture2D.SetPixels32(pixels.ToArray());
-            texture2D.filterMode = FilterMode.Point;
-            // texture2D.Compress(true);
-            texture2D.Apply();
-            
-            //直接通过Texture2D做偏移,并转为Sprite的偏移量
-            Vector2 offset = new Vector2(0f, 1f);
-            offset.x += -(graphicInfoData.OffsetX * 1f) / graphicInfoData.Width;
-            offset.y -= (-graphicInfoData.OffsetY * 1f) / graphicInfoData.Height;
-
-            Sprite sprite = Sprite.Create(texture2D, new Rect(0, 0, texture2D.width, texture2D.height), offset, 1,1,SpriteMeshType.FullRect);
-
-            //写入数据
-            graphicData.Version = graphicInfoData.Version;
-            graphicData.Index = graphicInfoData.Index;
-            graphicData.MapSerial = graphicInfoData.MapSerial;
-            graphicData.Width = graphicInfoData.Width;
-            graphicData.Height = graphicInfoData.Height;
-            graphicData.OffsetX = graphicInfoData.OffsetX;
-            graphicData.OffsetY = graphicInfoData.OffsetY;
-            graphicData.PaletIndex = PaletIndex;
-            graphicData.Sprite = sprite;
-            graphicData.PrimaryColor = primaryColor32;
-            
-            //缓存
-            if (!_cache.ContainsKey(graphicInfoData.Version))
-                _cache.Add(graphicInfoData.Version, new Dictionary<uint, Dictionary<int, GraphicData>>());
-            if(!_cache[graphicInfoData.Version].ContainsKey(graphicInfoData.Addr)) _cache[graphicInfoData.Version].Add(graphicInfoData.Addr,new Dictionary<int, GraphicData>());
-            if (!_cache[graphicInfoData.Version][graphicInfoData.Addr].ContainsKey(PaletIndex))
-                _cache[graphicInfoData.Version][graphicInfoData.Addr].Add(PaletIndex, graphicData);
-            
-            return graphicData;
         }
-        
     }
 }

CGTool/GraphicInfo.cs

@@ -42,11 +42,12 @@ namespace CGTool
         //bool      穿越标识
         public bool Blocked;
         //1 byte    作为地面无层级遮挡[Test]
-        public byte AsGround;
+        public bool AsGround;
         //4 bytes   未知标识
         public byte[] Unknow;
-        //4 bytes   地图编号
-        public uint MapSerial;
+        //4 bytes   编号
+        public uint Serial;
+        public int[] UnpackedPaletIndex;
     }
 
     public class GraphicInfo:MonoBehaviour
@@ -61,15 +62,38 @@ namespace CGTool
         
         //版本-Map编号映射字典  版本编号 -> MapSerial -> GraphicInfoData
         private static Dictionary<int, Dictionary<uint, GraphicInfoData>>
-            _mapSerialDict = new Dictionary<int, Dictionary<uint, GraphicInfoData>>();
+            _SerialDict = new Dictionary<int, Dictionary<uint, GraphicInfoData>>();
 
-        private static List<string> _graphicInfoPaths = new List<string>()
+        
+        private static Dictionary<int,string> _graphicInfoVersionPrefix = new Dictionary<int, string>()
         {
             //龙之沙漏 之前版本前Info数据
-            "GraphicInfo_66.bin",
+            {0,"GraphicInfo_"},
             //龙之沙漏 版本Info数据
-            "GraphicInfoEx_5.bin"
+            {1,"GraphicInfoEx_"}
         };
+        
+        private static List<string> _graphicInfoPaths = new List<string>();
+
+        public static void Init()
+        {
+            DirectoryInfo directoryInfo = new DirectoryInfo(CGTool.BaseFolder);
+            FileInfo[] files = directoryInfo.GetFiles();
+            //查找所有GraphicInfo数据文件
+            for (int i = 0; i < _graphicInfoVersionPrefix.Count; i++)
+            {
+                foreach (FileInfo fileInfo in files)
+                {
+                    if (fileInfo.Name.StartsWith(_graphicInfoVersionPrefix[i]))
+                    {
+                        _graphicInfoPaths.Add(fileInfo.Name);
+                        List<GraphicInfoData> list = GetGraphicInfo(i);
+                        Debug.Log("初始化GraphicInfo数据,版本号:" + i + ",数据量:" + list.Count + "条");
+                        break;
+                    }
+                }
+            }
+        }
 
         //获取GraphicInfo数据,Info数据加载后会缓存
         public static List<GraphicInfoData> GetGraphicInfo(int Version)
@@ -79,25 +103,38 @@ namespace CGTool
             
             //初始化映射库
             _indexDict.Add(Version,new Dictionary<uint, GraphicInfoData>());
-            _mapSerialDict.Add(Version,new Dictionary<uint, GraphicInfoData>());
+            _SerialDict.Add(Version,new Dictionary<uint, GraphicInfoData>());
             //加载并初始化数据
             List<GraphicInfoData> infoDatas = _loadGraphicInfo(Version);
             _cache.Add(Version, infoDatas);
             
             return infoDatas;
         }
-        //通过地面编号获取GraphicInfo数据
-        public static GraphicInfoData GetGraphicInfoDataByMapSerial(int Version, uint MapSerial)
+        //通过编号获取GraphicInfo数据
+        public static GraphicInfoData GetGraphicInfoDataBySerial(int Version, uint Serial)
         {
             GraphicInfoData graphicInfoData = null;
-            if (_mapSerialDict.ContainsKey(Version))
+            if (_SerialDict.ContainsKey(Version))
             {
-                _mapSerialDict[Version].TryGetValue(MapSerial, out graphicInfoData);
+                _SerialDict[Version].TryGetValue(Serial, out graphicInfoData);
                 // graphicInfoData = _mapSerialDict[Version][MapSerial];
             }
 
             return graphicInfoData;
         }
+        //通过编号获取GraphicInfo数据
+        public static GraphicInfoData GetGraphicInfoDataBySerial(uint Serial)
+        {
+            int Version = Serial >= 2000000 ? 1 : 0;
+            GraphicInfoData graphicInfoData = null;
+            if (_SerialDict.ContainsKey(Version) && _SerialDict[Version].ContainsKey(Serial))
+            {
+                
+                graphicInfoData = _SerialDict[Version][Serial];
+            }
+
+            return graphicInfoData;
+        }
         //通过索引获取GraphicInfo数据
         public static GraphicInfoData GetGraphicInfoDataByIndex(int Version, uint Index)
         {
@@ -110,6 +147,8 @@ namespace CGTool
             return graphicInfoData;
         }
         
+        
+        
         //初始化加载GraphicInfo
         private static List<GraphicInfoData> _loadGraphicInfo(int Version)
         {
@@ -139,13 +178,13 @@ namespace CGTool
                 graphicInfoData.East = fileReader.ReadByte();
                 graphicInfoData.South = fileReader.ReadByte();
                 graphicInfoData.Blocked =  fileReader.ReadByte() == 0;
-                graphicInfoData.AsGround = fileReader.ReadByte();
+                graphicInfoData.AsGround = fileReader.ReadByte() == 1;
                 graphicInfoData.Unknow = fileReader.ReadBytes(4);
-                graphicInfoData.MapSerial = BitConverter.ToUInt32(fileReader.ReadBytes(4),0);
+                graphicInfoData.Serial = BitConverter.ToUInt32(fileReader.ReadBytes(4),0);
 
                 //建立映射表
                 if(!_indexDict[Version].ContainsKey(graphicInfoData.Index)) _indexDict[Version].Add(graphicInfoData.Index, graphicInfoData);
-                if(graphicInfoData.MapSerial > 0 && !_mapSerialDict[Version].ContainsKey(graphicInfoData.MapSerial)) _mapSerialDict[Version].Add(graphicInfoData.MapSerial, graphicInfoData);
+                if(graphicInfoData.Serial > 0 && !_SerialDict[Version].ContainsKey(graphicInfoData.Serial)) _SerialDict[Version].Add(graphicInfoData.Serial, graphicInfoData);
                 
                 infoDatas.Add(graphicInfoData);
 

CGTool/Map.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 
 namespace CGTool
 {
@@ -27,6 +28,8 @@ namespace CGTool
         public GraphicInfoData GraphicInfo;
         // public uint GraphicIndex;
         public uint MapSerial;
+        public int FixPlayerZ;
+        public int ObjectZIndex = 0;
     }
     //地图信息
     public class MapInfo
@@ -34,11 +37,13 @@ namespace CGTool
         //地图编号
         public uint Serial;
         //地图宽度
-        public uint Width;
+        public int Width;
         //地图高度
-        public uint Height;
+        public int Height;
         // 地图名称
         public string Name;
+        // 调色板号 - 默认 -1 表示自动
+        public int Palet = -1;
         //未知数据
         public byte[] Unknow;
         //地面数据
@@ -46,11 +51,16 @@ namespace CGTool
         //地表数据
         public List<MapBlockData> ObjectDatas = new List<MapBlockData>();
         public bool[] BlockedIndexs;
-        public bool[,] MapPoints;
+        public float[] FixPlayerZs;
+        //地图坐标二维数组,用以记录可行走区域并作为自动寻路的数据参考
+        public bool[,] MapNodes;
     }
     
+    
     public class Map
     {
+        //Z轴修正值
+        public static readonly int FixZIndex = 24;
         
         //缓存数据
         private static Dictionary<uint, MapInfo> _cache = new Dictionary<uint, MapInfo>();
@@ -113,16 +123,23 @@ namespace CGTool
             byte[] mapHeader = mapFileReader.ReadBytes( 8);
             //地图名称
             byte[] mapNameBytes = mapFileReader.ReadBytes(32);
-            mapInfo.Name = System.Text.Encoding.GetEncoding("GBK").GetString(mapNameBytes).Split('|')[0];
+            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[] bytes = mapFileReader.ReadBytes(2);
             Array.Reverse(bytes);
-            mapInfo.Width = (uint)BitConverter.ToUInt16(bytes,0);
+            mapInfo.Width = BitConverter.ToUInt16(bytes,0);
             //读取地图高度
             bytes = mapFileReader.ReadBytes(2);
             Array.Reverse(bytes);
-            mapInfo.Height = (uint)BitConverter.ToUInt16(bytes,0);
+            mapInfo.Height = BitConverter.ToUInt16(bytes,0);
 
             byte[] mapBytes = mapFileReader.ReadBytes((int) (mapInfo.Width * mapInfo.Height * 2));
             byte[] mapCoverBytes = mapFileReader.ReadBytes((int) (mapInfo.Width * mapInfo.Height * 2));
@@ -141,8 +158,9 @@ namespace CGTool
             List<MapBlockData> tempObjectTiles = new List<MapBlockData>();
             
             // CGTool.Logger.Write("开始解析时间:" + DateTime.Now);
-            uint len = mapInfo.Width * mapInfo.Height;
-            for (uint i = 0; i < len; i++)
+            //原始数据为反转数据,即坐标起点为 1,1 排序方向为 y : 1=>0 x: 1=>0
+            int len = mapInfo.Width * mapInfo.Height;
+            for (int i = 0; i < len; i++)
             {
                 //地面数据
                 MapBlockData mapTile = null;
@@ -155,7 +173,7 @@ namespace CGTool
                     mapGraphicSerial += 200000;
                     Version = 1;
                 }
-                GraphicInfoData graphicInfoData = GraphicInfo.GetGraphicInfoDataByMapSerial(Version, mapGraphicSerial);
+                GraphicInfoData graphicInfoData = GraphicInfo.GetGraphicInfoDataBySerial(Version, mapGraphicSerial);
                 if (graphicInfoData != null)
                 {
                     mapTile = new MapBlockData();
@@ -174,7 +192,7 @@ namespace CGTool
                     mapCoverGraphicSerial += 200000;
                     Version = 1;
                 }
-                graphicInfoData = GraphicInfo.GetGraphicInfoDataByMapSerial(Version, mapCoverGraphicSerial);
+                graphicInfoData = GraphicInfo.GetGraphicInfoDataBySerial(Version, mapCoverGraphicSerial);
                 if (graphicInfoData != null)
                 {
                     mapCoverTile = new MapBlockData();
@@ -184,59 +202,114 @@ namespace CGTool
                 tempObjectTiles.Add(mapCoverTile);
             }
 
-            List<MapBlockData> GroundTiles = new List<MapBlockData>();
-            List<MapBlockData> ObjectTiles = new List<MapBlockData>();
-            bool[] blockedIndexs = new bool[mapInfo.Width * mapInfo.Height];
+            MapBlockData[] GroundTiles = new MapBlockData[len];
+            MapBlockData[] ObjectTiles = new MapBlockData[len];
+            bool[] blockedIndexs = new bool[len];
+            float[] fixPlayerZs = new float[len];
+            bool[,] nodes = new bool[mapInfo.Width, mapInfo.Height];
+
             // CGTool.Logger.Write("开始排序时间:" + DateTime.Now);
+            //重新排序
             for (int y = 0; y < mapInfo.Height; y++)
             {
                 for (int x = 0; x < mapInfo.Width; x++)
                 {
                     // int index = i * (int) mapInfo.Width + ((int) mapInfo.Width - j - 1);
-                    int _tmpindex = x + (int)((mapInfo.Height - y - 1) * mapInfo.Width);
-                    int index = x + y * (int)mapInfo.Width;
+                    int _tmpindex = x + (mapInfo.Height - y - 1) * mapInfo.Width;
+                    int index = x + y * mapInfo.Width;
                     
-                    MapBlockData mapTile = tempGroundTiles[_tmpindex]; 
+                    MapBlockData mapTile = tempGroundTiles[_tmpindex];
                     MapBlockData ObjectTile = tempObjectTiles[_tmpindex];
-                    
-                    GroundTiles.Add(mapTile);
-                    ObjectTiles.Add(ObjectTile);
 
-                    if (mapTile==null || mapTile.GraphicInfo.Blocked) blockedIndexs[index] = true;
-                    if (ObjectTile!=null && ObjectTile.GraphicInfo.Blocked)
-                    {
-                        blockedIndexs[index] = true;
-                        if (ObjectTile.GraphicInfo.East > 0 || ObjectTile.GraphicInfo.South > 0)
-                        {
-                            for (int i = x; i < (x + ObjectTile.GraphicInfo.East); i++)
-                            {
-                                for (int j = y; j < (y+ ObjectTile.GraphicInfo.South); j++)
-                                {
+                    GroundTiles[index] = mapTile;
+                    ObjectTiles[index] = ObjectTile;
 
-                                    if(i>=mapInfo.Width || j>=mapInfo.Height) continue;
-                                    int _index = (int) (j * mapInfo.Width + i);
-                                    blockedIndexs[_index] = true;
-                                }
-                            }
-                        }
-                    }
+                    if (mapTile==null || mapTile.GraphicInfo.Blocked) blockedIndexs[index] = true;
+                    if (ObjectTile!=null && ObjectTile.GraphicInfo !=null && ObjectTile.GraphicInfo.Blocked) blockedIndexs[index] = true;
+                    
+                    nodes[x, y] = !blockedIndexs[index];
+                    
+                    //角色默认层级
+                    // int objectTileZIndex = index * FixZIndex;
+                    fixPlayerZs[index] = 1;
                 }
             }
 
-            bool[,] points = new bool[mapInfo.Width, mapInfo.Height];
+            //整理Object Z轴层级遮挡及角色遮挡问题
             for (int y = 0; y < mapInfo.Height; y++)
             {
                 for (int x = 0; x < mapInfo.Width; x++)
                 {
-                    int index = x + y * (int)mapInfo.Width;
-                    points[x, y] = !blockedIndexs[index];
+                    int index = x + y * mapInfo.Width;
+                    int objectTileZIndex = index * FixZIndex;
+
+                    MapBlockData ObjectTile = ObjectTiles[index];
+                    if(ObjectTile==null || ObjectTile.GraphicInfo==null) continue;
+                    
+                    //Object默认层级
+                    ObjectTile.ObjectZIndex = objectTileZIndex;
+
+                    //角色Z轴补正
+                    //在自定义排序轴(1,1,-1)情况下,角色Z轴在物件y-1位置,到x+East位置,补正为48*x
+                    //在物件South+1位置,到x+East位置,补正为-48*x
+                    if (!ObjectTile.GraphicInfo.AsGround)
+                    {
+                        for(int i = x;i<(x+ObjectTile.GraphicInfo.East-1);i++)
+                        {
+                            int fix = 1;
+                            int oy = y - 1;
+                            int _index = (int) (oy * mapInfo.Width + i);
+                            if (fixPlayerZs[_index] == 1) fixPlayerZs[_index] = fix * (i - x + 1) * 240f + 0.1f;
+
+                            // fix = -1;
+                            // oy = y + ObjectTile.GraphicInfo.South;
+                            // _index = (int) (oy * mapInfo.Width + i);
+                            // if (fixPlayerZs[_index] == 0) fixPlayerZs[_index] = fix * (i - x + 1) * 100;
+                        }
+                        for(int i=y+1;i<(y+ObjectTile.GraphicInfo.South);i++)
+                        {
+                            int fix = 1;
+                            int ox = x - 1;
+                            int _index = (int) (i * mapInfo.Width + ox);
+                            if (fixPlayerZs[_index] == 1) fixPlayerZs[_index] = fix * (i - y - 1) * 240f + 0.1f;
+                        }
+                    }
+                    else
+                    {
+                        // ObjectTile.ObjectZIndex = 0;
+                    }
+
+
+                    //如果物件占地范围大于1x1,则需要处理遮挡
+                    if (ObjectTile.GraphicInfo.East > 1 || ObjectTile.GraphicInfo.South > 1)
+                    {
+                        //取物件占地中间点位置
+                        // objectTileZIndex = (x + ObjectTile.GraphicInfo.East / 2 + (y + ObjectTile.GraphicInfo.South / 2) * mapInfo.Width) * FixZIndex;
+                        // ObjectTile.ObjectZIndex = objectTileZIndex;
+                        //取物件左上角位置Z轴复写默认Z轴
+                        // ObjectTile.ObjectZIndex = (x + (y + ObjectTile.GraphicInfo.South) * mapInfo.Width) * FixZIndex;
+                        
+                        
+
+                        for (int i = x; i < (x + ObjectTile.GraphicInfo.East); i++)
+                        {
+                            for (int j = y; j < (y+ ObjectTile.GraphicInfo.South); j++)
+                            {
+                                if(i>=mapInfo.Width || j>=mapInfo.Height) continue;
+                                int _index = (int) (j * mapInfo.Width + i);
+                                blockedIndexs[_index] = true;
+                                nodes[i, j] = false;
+                            }
+                        }
+                    }
                 }
             }
 
-            mapInfo.GroundDatas = GroundTiles;
-            mapInfo.ObjectDatas = ObjectTiles;
+            mapInfo.GroundDatas = GroundTiles.ToList();
+            mapInfo.ObjectDatas = ObjectTiles.ToList();
             mapInfo.BlockedIndexs = blockedIndexs;
-            mapInfo.MapPoints = points;
+            mapInfo.MapNodes = nodes;
+            mapInfo.FixPlayerZs = fixPlayerZs;
             _cache[serial] = mapInfo;
             // CGTool.Logger.Write("地图解析完成时间:" + DateTime.Now);
             return mapInfo;

CGTool/Palet.cs

@@ -11,6 +11,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using CGR;
 using UnityEngine;
 // using Logger = Util.Logger;
 
@@ -99,12 +101,14 @@ namespace CGTool
                 color32.a = 0xFF;
                 PaletColors.Add(color32);
             }
+            
+            PaletColors.Add(Color.clear);
             //清理缓存
             paletReader.Dispose();
             paletReader.Close();
             paletFileStream.Dispose();
             paletFileStream.Close();
-            
+
             return PaletColors;
         }
     }

README.md

@@ -50,8 +50,8 @@ Graphic.GetGraphicData(GraphicInfoData graphicInfoData,int PaletIndex=0);
 * 当动画播放完成后会自动调用onFinishCallback回调函数
 * 另外可指定onActionListener和onAudioListener监听动画动作帧和音频帧
 * 目前已知的动作帧有:
-* 击中 0x27 | 0x28
-* 伤害结算 0x4E | 0x4F
+* 击中 20000
+* 伤害结算 10000
 */
 
 /**
@@ -80,30 +80,48 @@ AnimePlayer player.play(...params).nextPlay(...params);
 请根据情况自行探索修改代码适应应用场景
 
 ## 3、版本及功能概述
+### 1.1
+> `ADD` 音频索引及加载AudioTool
+> 
+> `ADD` 动画播放器添加对Image渲染支持，用以支持GUI动画播放
+> 
+> `ADD` Graphic增加地面图档动态合批
+> 
+> `ADD` Anime增加动画帧动态合批方法
+> 
+> `UPD` 优化Graphic解析，统一改为RGBA4444模式，以减少内存占用
+> 
+> `UPD` 重新整理初始化代码，优化初始化流程
+> 
+> `UPD` 优化动画播放器，增加动画相关处理方法
+> 
+> `UPD` 动画播放器添加对Image渲染支持，用以支持GUI动画播放
+> 
+> `FIX` 修复动画序列中攻击判定、音频序列解析方式错误的问题
+
 ### 1.0
 
 当前版本目前仅支持 魔力宝贝3.7-龙之沙漏 及以下版本的图档解析
 
->`ADD` 脚本初始化
+> `ADD` 脚本初始化
 > 
->`ADD` 图档索引GraphicInfo文件解析
+> `ADD` 图档索引GraphicInfo文件解析
 > 
->`ADD` 图档Graphic文件数据解析
+> `ADD` 图档Graphic文件数据解析
 > 
->`ADD` 调色板Palet文件解析
+> `ADD` 调色板Palet文件解析
 > 
->`ADD` 动画索引AnimeInfo文件解析
+> `ADD` 动画索引AnimeInfo文件解析
 > 
->`ADD` 动画Anime文件数据解析
+> `ADD` 动画Anime文件数据解析
 > 
->`ADD` <font color="red">服务端</font>地图文件解析
+> `ADD` <font color="red">服务端</font>地图文件解析
 
 
 
 ## 4、待处理
 
 - 支援 4.0 以上版本图档解析
-- 音频解析
 - 其他未知
 - 优化