diff Modules/WorldState.xml @ 89:74e714637d6a

WorldStateProgress fade-in is called for all visibility check falses
author Nenue
date Fri, 21 Oct 2016 18:03:35 -0400
parents b107b4df7eb6
children 6e2cb847c3c6
line wrap: on
line diff
--- a/Modules/WorldState.xml	Thu Oct 20 04:08:11 2016 -0400
+++ b/Modules/WorldState.xml	Fri Oct 21 18:03:35 2016 -0400
@@ -9,7 +9,7 @@
     </Anchors>
     <Size x="600" y="24" />
     <Frames>
-      <Frame name="$parentProgress" parentKey="Progress" mixin="VeneerWorldStateProgressMixin" inherits="VeneerMixinScripts" enableMouse="true">
+      <Frame name="$parentProgress" mixin="VeneerWorldStateProgressMixin" inherits="VeneerMixinScripts" enableMouse="true">
         <Anchors>
           <Anchor point="TOPLEFT" />
         </Anchors>
@@ -19,8 +19,14 @@
             <Scripts>
               <OnPlay>
                 --print('VnWorldState','fade out')
+                self:GetParent().faded = true
               </OnPlay>
+              <OnStop>
+                print('VnWorldState', '|cFF44FF00stopped fadeout')
+                self:GetParent():Update()
+              </OnStop>
               <OnFinished>
+                print('VnWorldState', '|cFFFFFF00end of fadeout')
                 self:GetParent():Hide()
                 self:GetParent():Update()
               </OnFinished>
@@ -34,21 +40,19 @@
                 self:GetParent().timeLived = 0
                 --print('VnWorldState', 'fade in')
               </OnPlay>
+              <OnStop>
+                self:GetParent():Update()
+              </OnStop>
               <OnFinished>
+                print('VnWorldState', '|cFFFFFF00end of fade IN')
+                self:GetParent().faded = nil
                 self:GetParent().timeLived = 0
               </OnFinished>
             </Scripts>
           </AnimationGroup>
           <AnimationGroup parentKey="TimedFadeOut" setToFinalAlpha="true">
-            <Alpha fromAlpha="1" toAlpha="0" duration="1.12" order="1" />
-            <Scripts>
-              <OnPlay>
-                --print('VnWorldState','fade out')
-              </OnPlay>
-              <OnFinished>
-                self:GetParent():HidePanel()
-              </OnFinished>
-            </Scripts>
+            <Alpha childKey="ProgressText" fromAlpha="1" toAlpha="0" duration="1.12" order="1" />
+            <Alpha childKey="Background" fromAlpha="1" toAlpha="0" duration="1.12" order="1" />
           </AnimationGroup>
 
           <AnimationGroup parentKey="ProgressFlash" setToFinalAlpha="true">
@@ -57,6 +61,9 @@
 
             <Alpha childKey="Spark" fromAlpha="0" toAlpha="1" duration="0.15" order="1" />
             <Alpha childKey="Spark" fromAlpha="1" toAlpha="0" duration="0.15" order="2" />
+
+
+            <Alpha childKey="ProgressSpark" fromAlpha="0" toAlpha="1" duration="0.15" order="1" startDelay=".45" />
             <Translation parentKey="translation" childKey="Spark" offsetX="600" offsetY="0" duration="0.30" order="1" />
             <Scripts>
               <OnPlay>
@@ -75,13 +82,24 @@
           </AnimationGroup>
         </Animations>
         <Layers>
+          <Layer level="BACKGROUND">
+            <Texture parentKey="Background" alphaMode="BLEND" file="Interface\LevelUp\BossBanner">
+              <Anchors>
+                <Anchor point="TOP" />
+                <Anchor point="BOTTOM" />
+                <Anchor point="LEFT" x="24" y="0" />
+                <Anchor point="RIGHT" x="-24" y="0" />
+              </Anchors>
+              <TexCoords left="0" right="0.8" top="0.45" bottom="0.55" />
+            </Texture>
+          </Layer>
           <Layer level="BORDER">
             <Texture parentKey="ProgressBG">
               <Anchors>
                 <Anchor point="TOPRIGHT" />
                 <Anchor point="BOTTOMLEFT" relativePoint="BOTTOMLEFT" x="0" y="12" />
               </Anchors>
-              <Color r="0" g="0" b="0" a="0.5" />
+              <Color r="0" g="0" b="0" a="0.75" />
             </Texture>
           </Layer>
           <Layer level="ARTWORK">
@@ -91,11 +109,15 @@
               </Anchors>
               <Color r="1" g="1" b="1" a="0.8" />
             </Texture>
+          </Layer>
+          <Layer level="ARTWORK" textureSubLevel="2">
+
             <Texture parentKey="OverflowBar" hidden="true">
               <Anchors>
-                <Anchor point="BOTTOMLEFT" />
+                <Anchor point="BOTTOM" relativeKey="$parent.ProgressBG" />
+                <Anchor point="TOP" relativeKey="$parent.ProgressBG" />
               </Anchors>
-              <Color a=".6" r="1" g="0" b=".5" />
+              <Color a="1" r="0.1" g=".35" b=".85" />
             </Texture>
           </Layer>
           <Layer level="OVERLAY">
@@ -109,6 +131,10 @@
                 <Anchor point="CENTER" relativePoint="LEFT" relativeKey="$parent.ProgressAdded" />
               </Anchors>
             </Texture>
+            <Texture parentKey="ProgressSpark" atlas="OBJFX_LineBurst">
+              <Size x="8" y="12" />
+            </Texture>
+
             <FontString parentKey="Label" inherits="VeneerNumberFont">
               <Anchors>
                 <Anchor point="CENTER" />
@@ -118,18 +144,18 @@
         </Layers>
       </Frame>
 
-      <Frame name="$parentZoneCurrency" parentKey="ZoneCurrency" mixin="VeneerWorldStateCurrencyMixin" hidden="true" inherits="VeneerMixinScripts, VeneerAnimations">
+      <Frame name="$parentZoneCurrency" mixin="VeneerWorldStateCurrencyMixin" hidden="true" inherits="VeneerMixinScripts, VeneerAnimations">
+        <Size x="240" y="24" />
         <Anchors>
-          <Anchor point="TOPRIGHT" />
+          <Anchor point="TOP" />
         </Anchors>
         <Layers>
           <Layer level="ARTWORK">
             <Texture parentKey="Icon" >
-              <Size x="24" y="24" />
+              <Size x="16" y="16" />
               <Anchors>
                 <Anchor point="LEFT" />
               </Anchors>
-              <TexCoords left="0.15" right="0.85" top="0.15" bottom="0.85" />
             </Texture>
           </Layer>
           <Layer level="OVERLAY">