diff Veneer.xml @ 82:be813a9d99c0

- order of operations regarding frame visibility checking - interaction with WorldPlan OrderHall module - fancy shmancy transition fades resulting from above
author Nenue
date Mon, 17 Oct 2016 13:00:26 -0400
parents 65ec88b30eb8
children 4ec4fd89fced
line wrap: on
line diff
--- a/Veneer.xml	Mon Oct 17 04:57:32 2016 -0400
+++ b/Veneer.xml	Mon Oct 17 13:00:26 2016 -0400
@@ -163,7 +163,7 @@
     <Scripts>
       <OnLoad method="OnLoad"  />
       <OnEvent method="OnEvent" />
-      <OnShow method="OnShow" />
+      <OnUpdate method="OnUpdate" />
     </Scripts>
   </Frame>
 
@@ -242,7 +242,6 @@
     <Frames>
       <Frame name="$parentProgress" parentKey="Progress" mixin="VeneerWorldStateProgressMixin" inherits="VeneerMixinScripts">
 
-        <Size x="600" y="12" />
         <Anchors>
           <Anchor point="TOPLEFT" />
         </Anchors>
@@ -259,6 +258,16 @@
               </Anchors>
               <Color r="1" g="1" b="1" a="0.8" />
             </Texture>
+            <Texture parentKey="OverflowBar" hidden="true">
+              <Anchors>
+                <Anchor point="BOTTOMLEFT" />
+              </Anchors>
+              <Color a=".6" r="1" g="0" b=".5" />
+            </Texture>
+            <Texture parentKey="ProgressAdded" hidden="true">
+
+              <Color a="1" r="1" g="1" b="1" />
+            </Texture>
           </Layer>
           <Layer level="OVERLAY">
             <FontString parentKey="Label" inherits="VeneerNumberFont">
@@ -268,13 +277,43 @@
             </FontString>
           </Layer>
         </Layers>
+        <Animations>
+          <AnimationGroup parentKey="TransitionFadeOut" setToFinalAlpha="true">
+            <Alpha fromAlpha="1" toAlpha="0" duration="0.15" order="1" />
+            <Scripts>
+              <OnPlay>
+                print('VnWorldState','fade out')
+              </OnPlay>
+              <OnFinished>
+                self:GetParent():Hide()
+                self:GetParent():Update()
+              </OnFinished>
+            </Scripts>
+          </AnimationGroup>
+          <AnimationGroup parentKey="TransitionFadeIn" setToFinalAlpha="true">
+            <Alpha fromAlpha="0" toAlpha="1" duration="0.15" order="1" />
+            <Scripts>
+              <OnPlay>
+                self:GetParent():ShowPanel()
+                self:GetParent().timeLived = 0
+                print('VnWorldState', 'fade in')
+              </OnPlay>
+              <OnFinished>
+                self:GetParent().timeLived = 0
+              </OnFinished>
+            </Scripts>
+          </AnimationGroup>
+          <AnimationGroup parentKey="ProgressFlash" setToFinalAlpha="true">
+            <Alpha fromAlpha="0" toAlpha="1" duration="0.15" order="1" childKey="ProgressAdded" />
+            <Alpha fromAlpha="1" toAlpha="0" duration="0.45" order="2" childKey="ProgressAdded" />
+          </AnimationGroup>
+        </Animations>
       </Frame>
 
       <Frame name="$parentZoneCurrency" parentKey="ZoneCurrency" mixin="VeneerWorldStateCurrencyMixin" hidden="true" inherits="VeneerMixinScripts">
         <Anchors>
           <Anchor point="TOPRIGHT" />
         </Anchors>
-        <Size x="200" y="24" />
         <Layers>
           <Layer level="ARTWORK">
             <Texture parentKey="Icon" >