فهرست منبع

Fix gold coin animation

1vanK 9 سال پیش
والد
کامیت
d6f5f5d45c

+ 5 - 4
Source/Samples/30_LightAnimation/LightAnimation.cpp

@@ -125,13 +125,14 @@ void LightAnimation::CreateScene()
     GetSubsystem<UI>()->GetRoot()->GetChild(String("animatingText"))->SetAttributeAnimation("Text", textAnimation);
 
     // Create UI element animation
-    // (note: a spritesheet should be used in real use cases for better performance)
+    // (note: a spritesheet and "Image Rect" attribute should be used in real use cases for better performance)
     SharedPtr<ValueAnimation> spriteAnimation(new ValueAnimation(context_));
     spriteAnimation->SetKeyFrame(0.0f, ResourceRef("Texture2D", "Urho2D/GoldIcon/1.png"));
     spriteAnimation->SetKeyFrame(0.1f, ResourceRef("Texture2D", "Urho2D/GoldIcon/2.png"));
-    spriteAnimation->SetKeyFrame(0.2f, ResourceRef("Texture2D", "Urho2D/GoldIcon/4.png"));
-    spriteAnimation->SetKeyFrame(0.3f, ResourceRef("Texture2D", "Urho2D/GoldIcon/5.png"));
-    spriteAnimation->SetKeyFrame(0.4f, ResourceRef("Texture2D", "Urho2D/GoldIcon/1.png"));
+    spriteAnimation->SetKeyFrame(0.2f, ResourceRef("Texture2D", "Urho2D/GoldIcon/3.png"));
+    spriteAnimation->SetKeyFrame(0.3f, ResourceRef("Texture2D", "Urho2D/GoldIcon/4.png"));
+    spriteAnimation->SetKeyFrame(0.4f, ResourceRef("Texture2D", "Urho2D/GoldIcon/5.png"));
+    spriteAnimation->SetKeyFrame(0.5f, ResourceRef("Texture2D", "Urho2D/GoldIcon/1.png"));
     GetSubsystem<UI>()->GetRoot()->GetChild(String("animatingSprite"))->SetAttributeAnimation("Texture", spriteAnimation);
 
     // Create light color animation

+ 5 - 4
bin/Data/LuaScripts/30_LightAnimation.lua

@@ -67,13 +67,14 @@ function CreateScene()
     ui.root:GetChild("animatingText"):SetAttributeAnimation("Text", textAnimation)
 
     -- Create UI element animation
-    -- (note: a spritesheet should be used in real use cases for better performance)
+    -- (note: a spritesheet and "Image Rect" attribute should be used in real use cases for better performance)
     local spriteAnimation = ValueAnimation:new()
     spriteAnimation:SetKeyFrame(0.0, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/1.png")))
     spriteAnimation:SetKeyFrame(0.1, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/2.png")))
-    spriteAnimation:SetKeyFrame(0.2, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/4.png")))
-    spriteAnimation:SetKeyFrame(0.3, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/5.png")))
-    spriteAnimation:SetKeyFrame(0.4, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/1.png")))
+    spriteAnimation:SetKeyFrame(0.2, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/3.png")))
+    spriteAnimation:SetKeyFrame(0.3, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/4.png")))
+    spriteAnimation:SetKeyFrame(0.4, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/5.png")))
+    spriteAnimation:SetKeyFrame(0.5, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/1.png")))
     ui.root:GetChild("animatingSprite"):SetAttributeAnimation("Texture", spriteAnimation)
 
     -- Create light position animation

+ 5 - 4
bin/Data/Scripts/30_LightAnimation.as

@@ -69,13 +69,14 @@ void CreateScene()
     ui.root.GetChild("animatingText").SetAttributeAnimation("Text", textAnimation);
     
     // Create UI element animation
-    // (note: a spritesheet should be used in real use cases for better performance)
+    // (note: a spritesheet and "Image Rect" attribute should be used in real use cases for better performance)
     ValueAnimation@ spriteAnimation = ValueAnimation();
     spriteAnimation.SetKeyFrame(0.0f, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/1.png")));
     spriteAnimation.SetKeyFrame(0.1f, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/2.png")));
-    spriteAnimation.SetKeyFrame(0.2f, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/4.png")));
-    spriteAnimation.SetKeyFrame(0.3f, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/5.png")));
-    spriteAnimation.SetKeyFrame(0.4f, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/1.png")));
+    spriteAnimation.SetKeyFrame(0.2f, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/3.png")));
+    spriteAnimation.SetKeyFrame(0.3f, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/4.png")));
+    spriteAnimation.SetKeyFrame(0.4f, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/5.png")));
+    spriteAnimation.SetKeyFrame(0.5f, Variant(ResourceRef("Texture2D", "Urho2D/GoldIcon/1.png")));
     ui.root.GetChild("animatingSprite").SetAttributeAnimation("Texture", spriteAnimation);
 
     // Create light position animation

+ 5 - 5
bin/Data/Urho2D/GoldIcon.scml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <spriter_data scml_version="1.0" generator="BrashMonkey Spriter" generator_version="b8_1">
     <folder id="0" name="GoldIcon">
-        <file id="0" name="GoldIcon/2.png" width="64" height="64" pivot_x="0.5" pivot_y="0.5"/>
-        <file id="1" name="GoldIcon/1.png" width="64" height="64" pivot_x="0.5" pivot_y="0.5"/>
-        <file id="2" name="GoldIcon/3.png" width="17" height="60" pivot_x="0.5" pivot_y="0.5"/>
+        <file id="0" name="GoldIcon/1.png" width="64" height="64" pivot_x="0.5" pivot_y="0.5"/>
+        <file id="1" name="GoldIcon/2.png" width="64" height="64" pivot_x="0.5" pivot_y="0.5"/>
+        <file id="2" name="GoldIcon/3.png" width="64" height="64" pivot_x="0.5" pivot_y="0.5"/>
         <file id="3" name="GoldIcon/4.png" width="64" height="64" pivot_x="0.5" pivot_y="0.5"/>
         <file id="4" name="GoldIcon/5.png" width="64" height="64" pivot_x="0.5" pivot_y="0.5"/>
     </folder>
@@ -28,10 +28,10 @@
             </mainline>
             <timeline id="0" name="1">
                 <key id="0" spin="0">
-                    <object folder="0" file="1" angle="0"/>
+                    <object folder="0" file="0" angle="0"/>
                 </key>
                 <key id="1" time="100" spin="0">
-                    <object folder="0" file="0" angle="0"/>
+                    <object folder="0" file="1" angle="0"/>
                 </key>
                 <key id="2" time="200" spin="0">
                     <object folder="0" file="2" angle="0"/>

BIN
bin/Data/Urho2D/GoldIcon/3.png


BIN
bin/Data/Urho2D/GoldIcon/4.png


BIN
bin/Data/Urho2D/GoldIcon/5.png