From: Vincent Vanwaelscappel Date: Thu, 1 Dec 2022 19:16:55 +0000 (+0100) Subject: wip #5601 @2 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=799659ac91502897a644e94c2b69dff4913b27dc;p=Animations.git wip #5601 @2 --- diff --git a/PPD/Map1/Map1.zip b/PPD/Map1/Map1.zip index b0d0d86..9a48054 100644 Binary files a/PPD/Map1/Map1.zip and b/PPD/Map1/Map1.zip differ diff --git a/PPD/Map1/_doc/publish.bat b/PPD/Map1/_doc/publish.bat index 69380d1..297569b 100644 --- a/PPD/Map1/_doc/publish.bat +++ b/PPD/Map1/_doc/publish.bat @@ -1,3 +1,3 @@ @echo off "C:\Program Files\7-Zip\7z.exe" a -tzip ../Map1.zip ../ -xr0!_doc -xr0!*.zip -xr0!*.less -xr0!*.map -scp ../Map1.zip extranet@workshop.fluidbook.com:/data1/extranet/www/fluidbook/books/working/21046 \ No newline at end of file +scp -P 51895 ../Map1.zip extranet@workshop.fluidbook.com:/application/fluidbook/books/working/21046 \ No newline at end of file diff --git a/PPD/Map1/index.html b/PPD/Map1/index.html index c6d1252..34bb018 100644 --- a/PPD/Map1/index.html +++ b/PPD/Map1/index.html @@ -4501,8 +4501,8 @@ id="e-1835"/> - - + + \ No newline at end of file diff --git a/PPD/Map2/Map2.zip b/PPD/Map2/Map2.zip index 44e29df..47f5e81 100644 Binary files a/PPD/Map2/Map2.zip and b/PPD/Map2/Map2.zip differ diff --git a/PPD/Map2/index.html b/PPD/Map2/index.html index 0099c6f..309f999 100644 --- a/PPD/Map2/index.html +++ b/PPD/Map2/index.html @@ -1,1400 +1,2166 @@ - - - - - - + + + + + +
- - -
-
-
+ @keyframes flashing { + from { + opacity: 0.3 + } + 50% { + opacity: 1 + } + to { + opacity: 0.3; + } + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
- - + + \ No newline at end of file diff --git a/PPD/Map2/map2.css b/PPD/Map2/map2.css index 93a7a96..f028b70 100644 --- a/PPD/Map2/map2.css +++ b/PPD/Map2/map2.css @@ -4,12 +4,17 @@ box-sizing: border-box; } #illu, +#illu1, #mainsteps { position: absolute; top: 0; left: 0; } -#illu { +#illu1 { + left: -20px; +} +#illu, +#illu1 { z-index: 0; transition: opacity 300ms; } diff --git a/PPD/Map2/map2.css.map b/PPD/Map2/map2.css.map index 02fcb92..9cd1bcc 100644 --- a/PPD/Map2/map2.css.map +++ b/PPD/Map2/map2.css.map @@ -1 +1 @@ -{"version":3,"sources":["map2.less"],"names":[],"mappings":"AAAA;EACE,SAAA;EACA,UAAA;EACA,sBAAA;;AAKF;AAAO;EACL,kBAAA;EACA,MAAA;EACA,OAAA;;AAGF;EACE,UAAA;EACA,yBAAA;;AAGF;EACE,qBAAA;;AAGF;EACE,sCAAA;;AAGF;EACE;IACE,YAAA;;EAEF;IACE,UAAA;;EAEF;IACE,YAAA;;;AAIJ;EACE,kBAAA;EACA,MAAA;EACA,OAAA;EACA,gBAAA;EACA,iBAAA;EACA,UAAA;EACA,oBAAA;EACA,UAAA;EACA,yBAAA;;AATF,QAUE;EACE,gBAAA;EACA,iBAAA;EACA,WAAW,YAAY,2BAAvB;;AAIJ;EACE,kBAAA;EACA,MAAA;EACA,OAAA;EACA,UAAA;EACA,oBAAA;EACA,UAAA;EACA,yBAAA;;AAPF,UAQE;EACE,WAAA;EACA,YAAA;EACA,WAAW,YAAY,6BAAvB;;AAKJ;EACE,gBAAA;EACA,iBAAA;EACA,UAAA;EACA,oBAAA;;AAJF,UAME;EACE,kBAAA;EACA,SAAA;EACA,QAAA;EACA,qBAAA;EACA,WAAW,WAAX;;AAXJ,UAME,MAOE;EACE,cAAA;EACA,kBAAA;EACA,WAAA;EACA,YAAA;EACA,aAAA;EACA,MAAM,gBAAN;EACA,wBAAA;EACA,0BAAA;EACA,sBAAsB,UAAtB;EACA,UAAA;;AAvBN,UAME,MAoBE;EACE,cAAA;;AAGF,UAxBF,MAwBG;EACC,WAAA;EACA,UAAA;;AAGF,UA7BF,MA6BG;EACC,WAAA;EACA,UAAA;;AAGF,UAlCF,MAkCG;EACC,WAAA;EACA,UAAA;;AAFF,UAlCF,MAkCG,GAIC;EACE,WAAA;EACA,MAAM,gBAAN;;AAIJ,UA5CF,MA4CG;EACC,WAAA;EACA,UAAA;;AAGF,UAjDF,MAiDG;EACC,WAAA;EACA,UAAA;EACA,WAAW,kBAAX;;AAGF,UAvDF,MAuDG;EACC,WAAA;EACA,UAAA;EACA,WAAW,WAAX;;AAGF,UA7DF,MA6DG;EACC,YAAA;EACA,UAAA;;AAIF,UAnEF,MAmEG;EACC,YAAA;EACA,UAAA","file":"map2.css"} \ No newline at end of file +{"version":3,"sources":["map2.less"],"names":[],"mappings":"AAAA;EACE,SAAA;EACA,UAAA;EACA,sBAAA;;AAMF;AAAO;AAAQ;EACb,kBAAA;EACA,MAAA;EACA,OAAA;;AAGF;EACE,WAAA;;AAKF;AAAM;EACJ,UAAA;EACA,yBAAA;;AAGF;EACE,qBAAA;;AAGF;EACE,sCAAA;;AAGF;EACE;IACE,YAAA;;EAEF;IACE,UAAA;;EAEF;IACE,YAAA;;;AAIJ;EACE,kBAAA;EACA,MAAA;EACA,OAAA;EACA,gBAAA;EACA,iBAAA;EACA,UAAA;EACA,oBAAA;EACA,UAAA;EACA,yBAAA;;AATF,QAUE;EACE,gBAAA;EACA,iBAAA;EACA,WAAW,YAAY,2BAAvB;;AAIJ;EACE,kBAAA;EACA,MAAA;EACA,OAAA;EACA,UAAA;EACA,oBAAA;EACA,UAAA;EACA,yBAAA;;AAPF,UAQE;EACE,WAAA;EACA,YAAA;EACA,WAAW,YAAY,6BAAvB;;AAIJ;EACE,gBAAA;EACA,iBAAA;EACA,UAAA;EACA,oBAAA;;AAJF,UAME;EACE,kBAAA;EACA,SAAA;EACA,QAAA;EACA,qBAAA;EACA,WAAW,WAAX;;AAXJ,UAME,MAOE;EACE,cAAA;EACA,kBAAA;EACA,WAAA;EACA,YAAA;EACA,aAAA;EACA,MAAM,gBAAN;EACA,wBAAA;EACA,0BAAA;EACA,sBAAsB,UAAtB;EACA,UAAA;;AAvBN,UAME,MAoBE;EACE,cAAA;;AAGF,UAxBF,MAwBG;EACC,WAAA;EACA,UAAA;;AAGF,UA7BF,MA6BG;EACC,WAAA;EACA,UAAA;;AAGF,UAlCF,MAkCG;EACC,WAAA;EACA,UAAA;;AAFF,UAlCF,MAkCG,GAIC;EACE,WAAA;EACA,MAAM,gBAAN;;AAIJ,UA5CF,MA4CG;EACC,WAAA;EACA,UAAA;;AAGF,UAjDF,MAiDG;EACC,WAAA;EACA,UAAA;EACA,WAAW,kBAAX;;AAGF,UAvDF,MAuDG;EACC,WAAA;EACA,UAAA;EACA,WAAW,WAAX;;AAGF,UA7DF,MA6DG;EACC,YAAA;EACA,UAAA;;AAIF,UAnEF,MAmEG;EACC,YAAA;EACA,UAAA","file":"map2.css"} \ No newline at end of file diff --git a/PPD/Map2/map2.js b/PPD/Map2/map2.js index 9dbd25e..4c71776 100644 --- a/PPD/Map2/map2.js +++ b/PPD/Map2/map2.js @@ -4,7 +4,7 @@ var pJquery = window.parent.jQuery; var mainSteps = [1, 4, 6, 8, 10, 12, 14, 16]; -var NB_STEPS = 25; +var NB_STEPS = 26; var currentFlashing = 1; var completedSteps = []; @@ -13,47 +13,53 @@ var lastPassedStep = 0; var STEPS = { - 1: {"layers": [], 'e': 's1'}, - 2: {"layers": '9347,9348,9349,9350'}, - 3: {"layers": '9000', 'show': '9125-9134,9319-9325'}, - 4: {"layers": [], 'e': 's4'}, - 5: {"layers": '9003', 'show': '9135-9139,9325-9326'}, - 6: {"layers": [], 'e': 's6'}, - 7: {"layers": '9006', 'show': '9140-9144,9327-9329'}, - 8: {"layers": [], 'e': 's8'}, - 9: {"layers": '9009', 'show': '9145-9150,9330-9333'}, - 10: {"layers": [], 'e': 's10'}, - 11: {"layers": '9012', 'show': '9151-9191,9334-9335'}, - 12: {"layers": [], 'e': 's12'}, - 13: {"layers": '9015', 'show': '9192-9280,9336-9339'}, - 14: {"layers": [], 'e': 's14'}, - 15: {"layers": '9018', 'show': '9281-9301,9340-9341'}, - 16: {"layers": [], 'e': 's16'}, - 17: {"layers": '9021', 'show': '9302-9314,9342-9346'}, - 19: {"layers": '8874-8877', 'flashing': '8878', 'show': []}, - 20: {"layers": '8917-8920', 'flashing': '8921', 'show': []}, - 21: {"layers": '8832-8840', 'flashing': '8841', 'show': []}, - 22: {"layers": '9107,9110', 'flashing': '9108', 'show': []}, - 23: {"layers": '8934-8941', 'flashing': '8942', 'show': []}, - 24: {"layers": '9035-9038,9040', 'flashing': '9061', 'show': []}, - 25: {"layers": '8744-8745', 'flashing': '8788', 'show': []}, - 26: {"layers": '8944-8946', 'flashing': '8949', 'show': []}, + 1: {"layers": [], 'e': 's1', 'prefix': 'e'}, + 2: {"layers": '9347,9348,9349,9350', 'prefix': 'e'}, + 3: {"layers": '9000', 'prefix': 'e', 'show': '9125-9134,9319-9325'}, + 4: {"layers": [], 'prefix': 'e', 'e': 's4'}, + 5: {"layers": '9003', 'prefix': 'e', 'show': '9135-9139,9325-9326'}, + 6: {"layers": [], 'prefix': 'e', 'e': 's6'}, + 7: {"layers": '9006', 'prefix': 'e', 'show': '9140-9144,9327-9329'}, + 8: {"layers": [], 'prefix': 'e', 'e': 's8'}, + 9: {"layers": '9009', 'prefix': 'e', 'show': '9145-9150,9330-9333'}, + 10: {"layers": [], 'prefix': 'e', 'e': 's10'}, + 11: {"layers": '9012', 'prefix': 'e', 'show': '9151-9191,9334-9335'}, + 12: {"layers": [], 'prefix': 'e', 'e': 's12'}, + 13: {"layers": '9015', 'prefix': 'e', 'show': '9192-9280,9336-9339'}, + 14: {"layers": [], 'prefix': 'e', 'e': 's14'}, + 15: {"layers": '9018', 'prefix': 'e', 'show': '9281-9301,9340-9341'}, + 16: {"layers": [], 'prefix': 'e', 'e': 's16'}, + 17: {"layers": '9021', 'prefix': 'e', 'show': '9302-9314,9342-9346'}, + 19: {"layers": '211-214', 'flashing': '215-216', 'prefix': 'f', 'show': []}, + 20: {"layers": '242-249', 'flashing': '250-251', 'prefix': 'f', 'show': []}, + 21: {"layers": '374-377', 'flashing': '378-379', 'prefix': 'f', 'show': []}, + 22: {"layers": '380-383', 'flashing': '385-386', 'prefix': 'f', 'show': []}, + 23: {"layers": '483-484', 'flashing': '8942', 'prefix': 'f', 'show': []}, + 24: {"layers": '430-432,480-482', 'flashing': '433', 'prefix': 'f', 'show': []}, + 25: {"layers": '279-280', 'flashing': '428-429', 'prefix': 'f', 'show': []}, + 26: {"layers": '325-333', 'flashing': '334-335', 'prefix': 'f', 'show': []}, + 27: {"layers": '252-256', 'flashing': '277-279', 'prefix': 'f', 'show': []}, }; var congratSteps = parseList('1-17'); $(function () { + + $.each(mainSteps, function (k, v) { $("#mainsteps").append(''); }) setTimeout(function () { + $.each(parseList('9050-9052,9041-9048,8922-8923,9090,9101,9083,9066,8806,8790-8792,8812-8842,8742-8779,8785-8789,8760,8761,8880,8888,8901,8905,8878,8855,8859,8921,8841,9108,8942,9061,8788,8949,8874-8877,8917-8920,8832-8840,9107,9110,8934-8941,9035-9038,9040,8744-8745,8944-8946,8843,8947'), function (k, v) { + $("#e-" + v).remove(); + }); $.each(parseList('9315-9318,8669-8675'), function (k, v) { $("#e-" + v).remove(); }); - $.each(parseList('8623,8630'), function (k,v) { + $.each(parseList('8623,8630'), function (k, v) { $("#e-" + v).css({transform: 'translateY(10px)'}); }); @@ -61,9 +67,9 @@ $(function () { $("#e-" + v).css({transform: 'translateY(140px)'}); }); - for (var i = 19; i <= 26; i++) { + for (var i = 19; i <= 27; i++) { $.each(parseList(STEPS[i].layers), function (k, v) { - $("#e-" + v).css('fill', '#666'); + $("#"+STEPS[i].prefix+"-" + v).css('fill', '#666'); }); } }, 200); @@ -95,10 +101,10 @@ $(function () { $.each(STEPS, function (step, data) { $.each(parseList(data.show), function (k, id) { - $("#e-" + id).addClass('hidden'); + $("#"+data.prefix+"-" + id).addClass('hidden'); }); $.each(parseList(data.layers), function (k, id) { - $("#e-" + id).addClass('disabled'); + $("#"+data.prefix+"-" + id).addClass('disabled'); }); }); @@ -110,7 +116,7 @@ $(function () { }) setTimeout(function () { - $("#illu").css('opacity', 1); + $("#illu, #illu1").css('opacity', 1); $("#startup").css('opacity', 1); $("#reporting").css('opacity', 1); }, 300) @@ -122,10 +128,10 @@ function setStep(s) { return; } $.each(parseList(STEPS[s].layers), function (k, id) { - $("#e-" + id).removeClass('disabled').removeClass('flashing'); + $("#"+STEPS[s].prefix+"-" + id).removeClass('disabled').removeClass('flashing'); }); $.each(parseList(STEPS[s].show), function (k, id) { - $("#e-" + id).removeClass('hidden'); + $("#"+STEPS[s].prefix+"-" + id).removeClass('hidden'); }); if (STEPS[s].e !== undefined) { $("#" + STEPS[s].e).removeClass('hidden').removeClass('flashing').addClass('enabled'); @@ -149,8 +155,8 @@ function setStep(s) { if (currentFlashing === s) { - for (var i = s + 1; s <= 27; i++) { - if (i === 18 || i === 27 || completedSteps.indexOf(i) >= 0) { + for (var i = s + 1; s <= 28; i++) { + if (i === 18 || i === 28 || completedSteps.indexOf(i) >= 0) { continue; } setFlashing(i); @@ -199,12 +205,12 @@ function setFlashing(s, cancel) { } $.each(parseList(STEPS[s].layers), function (k, id) { - $("#e-" + id).removeClass('disabled').addClass('flashing'); + $("#"+STEPS[s].prefix+"-" + id).removeClass('disabled').addClass('flashing'); }); $.each(parseList(STEPS[s].flashing), function (k, id) { - $("#e-" + id).removeClass('disabled').addClass('flashing'); + $("#"+STEPS[s].prefix+"-" + id).removeClass('disabled').addClass('flashing'); }); if (STEPS[s].e !== undefined) { $("#" + STEPS[s].e).removeClass('hidden').addClass('flashing'); diff --git a/PPD/Map2/map2.less b/PPD/Map2/map2.less index 89a57d2..ea89946 100644 --- a/PPD/Map2/map2.less +++ b/PPD/Map2/map2.less @@ -6,13 +6,20 @@ @w: 1190.55px; @h: 419.528px; -#illu, #mainsteps { + +#illu, #illu1, #mainsteps { position: absolute; top: 0; left: 0; } -#illu { +#illu1{ + left:-20px +} + + + +#illu,#illu1 { z-index: 0; transition: opacity 300ms; } @@ -69,7 +76,6 @@ } } - #mainsteps { width: @w; height: @h;