Add support for changing skeleton animation in controller and transition.

Author: xiaoguzhu

Assets/Scripts/UI/GLoader3D.cs

@@ -237,6 +237,7 @@ public string animationName
             {
                 _animationName = value;
                 OnChange("animationName");
+                UpdateGear(5);
             }
         }
 
@@ -251,6 +252,7 @@ public string skinName
             {
                 _skinName = value;
                 OnChange("skinName");
+                UpdateGear(5);
             }
         }
 

Assets/Scripts/UI/Gears/GearAnimation.cs

@@ -7,6 +7,8 @@ class GearAnimationValue
     {
         public bool playing;
         public int frame;
+        public string animationName;
+        public string skinName;
 
         public GearAnimationValue(bool playing, int frame)
         {
@@ -31,6 +33,11 @@ public GearAnimation(GObject owner)
         protected override void Init()
         {
             _default = new GearAnimationValue(((IAnimationGear)_owner).playing, ((IAnimationGear)_owner).frame);
+            if (_owner is GLoader3D)
+            {
+                _default.animationName = ((GLoader3D)_owner).animationName;
+                _default.skinName = ((GLoader3D)_owner).skinName;
+            }
             _storage = new Dictionary<string, GearAnimationValue>();
         }
 
@@ -49,6 +56,17 @@ override protected void AddStatus(string pageId, ByteBuffer buffer)
             gv.frame = buffer.ReadInt();
         }
 
+        public void AddExtStatus(string pageId, ByteBuffer buffer)
+        {
+            GearAnimationValue gv;
+            if (pageId == null)
+                gv = _default;
+            else
+                gv = _storage[pageId];
+            gv.animationName = buffer.ReadS();
+            gv.skinName = buffer.ReadS();
+        }
+
         override public void Apply()
         {
             _owner._gearLocked = true;
@@ -60,6 +78,11 @@ override public void Apply()
             IAnimationGear mc = (IAnimationGear)_owner;
             mc.frame = gv.frame;
             mc.playing = gv.playing;
+            if (_owner is GLoader3D)
+            {
+                ((GLoader3D)_owner).animationName = gv.animationName;
+                ((GLoader3D)_owner).skinName = gv.skinName;
+            }
 
             _owner._gearLocked = false;
         }
@@ -69,12 +92,18 @@ override public void UpdateState()
             IAnimationGear mc = (IAnimationGear)_owner;
             GearAnimationValue gv;
             if (!_storage.TryGetValue(_controller.selectedPageId, out gv))
-                _storage[_controller.selectedPageId] = new GearAnimationValue(mc.playing, mc.frame);
+                _storage[_controller.selectedPageId] = gv = new GearAnimationValue(mc.playing, mc.frame);
             else
             {
                 gv.playing = mc.playing;
                 gv.frame = mc.frame;
             }
+
+            if (_owner is GLoader3D)
+            {
+                gv.animationName = ((GLoader3D)_owner).animationName;
+                gv.skinName = ((GLoader3D)_owner).skinName;
+            }
         }
     }
 }

Assets/Scripts/UI/Gears/GearBase.cs

@@ -124,6 +124,24 @@ public void Setup(ByteBuffer buffer)
                 _tweenConfig.customEase = new CustomEase();
                 _tweenConfig.customEase.Create(buffer.ReadPath());
             }
+
+            if (buffer.version >= 6)
+            {
+                if (this is GearAnimation)
+                {
+                    for (int i = 0; i < cnt; i++)
+                    {
+                        string page = buffer.ReadS();
+                        if (page == null)
+                            continue;
+
+                        ((GearAnimation)this).AddExtStatus(page, buffer);
+                    }
+
+                    if (buffer.ReadBool())
+                        ((GearAnimation)this).AddExtStatus(null, buffer);
+                }
+            }
         }
 
         virtual public void UpdateFromRelations(float dx, float dy)

Assets/Scripts/UI/Transition.cs

@@ -408,7 +408,7 @@ public float totalDuration
         {
             get { return _totalDuration; }
         }
-
+        
         /// <summary>
         /// 
         /// </summary>
@@ -472,6 +472,10 @@ public void SetValue(string label, params object[] aParams)
                             tvalue.frame = Convert.ToInt32(aParams[0]);
                             if (aParams.Length > 1)
                                 tvalue.playing = Convert.ToBoolean(aParams[1]);
+                            if (aParams.Length > 2)
+                                tvalue.animationName = (string)aParams[2];
+                            if (aParams.Length > 3)
+                                tvalue.skinName = (string)aParams[3];
                         }
                         break;
 
@@ -1322,6 +1326,10 @@ void ApplyValue(TransitionItem item)
                         ((IAnimationGear)item.target).playing = value.playing;
                         ((IAnimationGear)item.target).timeScale = _timeScale;
                         ((IAnimationGear)item.target).ignoreEngineTimeScale = _ignoreEngineTimeScale;
+                        if (value.animationName != null)
+                            ((GLoader3D)item.target).animationName = value.animationName;
+                        if (value.skinName != null)
+                            ((GLoader3D)item.target).skinName = value.skinName;
                     }
                     break;
 
@@ -1527,6 +1535,11 @@ void DecodeValue(TransitionItem item, ByteBuffer buffer, object value)
                 case TransitionActionType.Animation:
                     ((TValue_Animation)value).playing = buffer.ReadBool();
                     ((TValue_Animation)value).frame = buffer.ReadInt();
+                    if (buffer.version >= 6)
+                    {
+                        ((TValue_Animation)value).animationName = buffer.ReadS();
+                        ((TValue_Animation)value).skinName = buffer.ReadS();
+                    }
                     break;
 
                 case TransitionActionType.Visible:
@@ -1662,6 +1675,8 @@ class TValue_Animation
         public int frame;
         public bool playing;
         public bool flag;
+        public string animationName;
+        public string skinName;
     }
 
     class TValue_Sound