gemercheung 2 lat temu
rodzic
commit
591a75034a

+ 14 - 62
packages/qjkankan-editor/public/static/template/customTooltip.xml

@@ -88,7 +88,7 @@
         registerattribute(frame, 0); 
         registerattribute(animatiedOn, 1); 
         registerattribute(frameRate, %3);
-     
+        trace('frameRate::',get(frameRate));
         set(crop, '0|0|%1|%2'); 
         clearinterval(calc('crop_anim_' + name));
         if(%3 == '' OR frameRate == 0 OR isNaN(frameRate),
@@ -98,7 +98,7 @@
         );
         trace('params::1::',%1,'::2::',%2,'::3::',%3,':frameRate:',get(frameRate));
         trace('xframes1::',get(xframes),'::yframes1::',get(yframes));
- 
+   
                
         if(frameRate GE 0,
         setinterval(
@@ -106,7 +106,7 @@
             get(frameRate),
             if(loaded, 
                 inc(frame); 
-
+               
                 <!-- trace('frame::',get(frame),'xframes2::',get(xframes),'::yframes2::',get(yframes)); -->
                 if(frame GE frames, if(onlastframe !== null, onlastframe() ); set(frame,0); );
                 mod(xpos,frame, xframes); 
@@ -125,50 +125,6 @@
         );
         );   
 	</action>
-    <!-- <action name="crop_animation_r_stop">
-      set(cur,%1);
-      tolower(cur, cur);
-      set(curIn,  calc('crop_anim_r_' + cur));
-      clearinterval(curIn); 
-    </action> -->
-    
-    <!-- <action name="crop_animation_reapply">
-        txtadd(cur,'',%1);
-        tolower(cur, cur);
-        txtadd(frameRate,'',%2);
-        txtadd(framewidth,'',%3);
-        txtadd(frameNumber,'',%4);
-        copy(frames, hotspot[get(cur)].frames);
-        copy(xframes, hotspot[get(cur)].xframes);
-        copy(yframes, hotspot[get(cur)].yframes);
-        copy(animatiedOn, hotspot[get(cur)].animatiedOn);
-        set(frame,0);
-        set(curIn,  calc('crop_anim_r_' + cur));
-
-        clearinterval(curIn); 
-        if(get(frameRate) GE 0,
-           setinterval(curIn,
-            get(frameRate),
-            inc(frame);
-            copy(on, hotspot[get(cur)].on);
-         
-            if(frame GE frames, set(frame,0); );
-            mod(xpos,frame, xframes); 
-            div(ypos, frame, xframes);
-            Math.floor(ypos);
-            mul(xpos, framewidth);
-            mul(ypos,framewidth); 
-            trace('frame-1::',get(animatiedOn));
-            calc(crop, xpos +'|' + ypos + '|'+framewidth +'|' + framewidth);
-            if(frames == -1, 
-                 copy(hotspot[get(hsp_name)].crop,'0|0|204|204');
-            );
-         
-            copy(hotspot[get(hsp_name)].crop,crop);
-        );
-        );
-    
-    </action> -->
 
     <action name="add_tooltip_label">
         txtadd(tooltipname, 'tooltip_', get(name)); 
@@ -469,7 +425,7 @@
         trace('iconUrl::',iconUrl);
         set(hotspot[get(hsp_name)].height,%8);
         set(hotspot[get(hsp_name)].width,%8);
-
+        set(hotspot[get(hsp_name)].url,get(iconUrl));
         delayedcall(0.1,txtadd(tooltipname, 'tooltip_', get(hsp_name)); set_label_pos(get(tooltipname),get(layer[get(tooltipname)].pos)););
         
         indexoftxt(index, get(iconUrl), 'image_place_holder.png');
@@ -509,28 +465,24 @@
          set(hotspot[get(hsp_name)].xframes, 1);
         
 
-          if(!isNaN(frameRate) AND frameRate GT 0,set(hotspot[get(hsp_name)].frameRate,get(frameRate)));
+          if(!isNaN(frameRate) AND frameRate GT 0,
+          
+            jsget(timestamp,'Date.now();');
+            trace('setframeRate',get(calc(iconUrl +'?'+ timestamp)));
+            set(hotspot[get(hsp_name)].frameRate,get(frameRate));
+            set(hotspot[get(hsp_name)].url,get(calc(iconUrl +'?'+ timestamp)));
+          );
           if(!isNaN(framewidth) AND framewidth GT 0,set(hotspot[get(hsp_name)].framewidth,get(framewidth)));
           if(!isNaN(frameNumber) AND frameNumber GT 0,
              set(hotspot[get(hsp_name)].frameNumber,get(frameNumber));
              set(hotspot[get(hsp_name)].yframes, get(frameNumber));
           );
-
-          <!-- trace('animatiedOn::',get(hotspot[get(hsp_name)].animatiedOn)); -->
-          <!-- set(hotspot[get(hsp_name)].frameNumber,get(frameNumber));
-          set(hotspot[get(hsp_name)].framewidth,get(framewidth)); -->
-         
-
-          <!-- set(hotspot[get(hsp_name)].frameRate,get(frameRate)); -->
-          <!-- set(hotspot[get(hsp_name)].xframes,1);
-          set(hotspot[get(hsp_name)].yframes,1,get(frameNumber)); -->
-          <!-- txtreplace(hotspot[get(hsp_name)].onloaded,"do_crop_animation(84,84,60);","do_crop_animation(get(hsp_name),get(frameRate),get(framewidth),get(frameNumber));"); -->
-        );
+      );
      
-        set(hotspot[get(hsp_name)].url,get(iconUrl));
+
         set(hotspot[get(hsp_name)].rotate,0);
         set(layer[get(hsLabel)].rotate,0);
-        <!-- set(layer[get(hsDot)].visible,false); -->
+
         trace('last_edit::',hotspot[get(hsp_name)].onloaded);
        );