From 36a47e9c7fb85e502bb05916af9b2792bbe1ece4 Mon Sep 17 00:00:00 2001 From: Daniele Giardini Date: Mon, 6 Apr 2015 11:41:21 +0200 Subject: [PATCH] Fixed bug where Sequences using LoopType.Restart were not firing callbacks at 0 time after the first loop cycle --- .../Assets/Demigiant/DOTween/DOTween.dll | Bin 124416 -> 124416 bytes .../Assets/Demigiant/DOTween/DOTween.dll.mdb | Bin 47537 -> 47537 bytes .../Assets/Demigiant/DOTween/DOTween.dll | Bin 124416 -> 124416 bytes .../Assets/Demigiant/DOTween/DOTween.dll.mdb | Bin 47537 -> 47537 bytes .../Assets/Demigiant/DOTween/DOTween.dll | Bin 124416 -> 124416 bytes .../Assets/Demigiant/DOTween/DOTween.dll.mdb | Bin 47537 -> 47537 bytes .../Assets/_Tests/Bugs/LoopTypeRestart.cs | 47 ++++++++++++++++++ .../_Tests/Bugs/LoopTypeRestart.cs.meta | 12 +++++ .../Assets/_Tests/Bugs/LoopTypeRestart.unity | Bin 0 -> 13256 bytes .../_Tests/Bugs/LoopTypeRestart.unity.meta | 8 +++ .../Assets/_Tests/TempTests.unity | Bin 12300 -> 12300 bytes _DOTween.Assembly/DOTween/DOTween.cs | 2 +- _DOTween.Assembly/DOTween/Sequence.cs | 6 ++- _DOTween.Assembly/bin/DOTween.dll | Bin 124416 -> 124416 bytes _DOTween.Assembly/bin/DOTween.dll.mdb | Bin 47537 -> 47537 bytes 15 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 UnityTests.Unity5/Assets/_Tests/Bugs/LoopTypeRestart.cs create mode 100644 UnityTests.Unity5/Assets/_Tests/Bugs/LoopTypeRestart.cs.meta create mode 100644 UnityTests.Unity5/Assets/_Tests/Bugs/LoopTypeRestart.unity create mode 100644 UnityTests.Unity5/Assets/_Tests/Bugs/LoopTypeRestart.unity.meta diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index a717f6254962bd660df041fb23dc60828bca2b8a..394269d0e1c629c36fcda3369f78f5497bd036c6 100644 GIT binary patch delta 147 zcmV;E0Brw&%m;wX2at#Z1XLoii(MH3`jhDyu?orn0007easU7Xv!)tG0RjL3gX|l( z>>B}uiX}ucGBq(cL@+HuH!wskG%+wSEjU9%FfBPZIYcr!MmaV#L^6GsKBoa2x3H!G zJ`Mplx9_w8p#u=m7$wpTrvX8Xz?YpV`DD_!ptu2SB?AOhB9{-|0Vx4ow>jPc#|L@y BFdP5? delta 146 zcmV;D0B!$(%m;wX2at#ZF>@iYi(MH3{FCV!u?)-r0007easU7X1z5AB8b$$w>>Ic2 z8v%rhB|IW12JNja*V{<#IyLiA<-vLUfVy^bn=w^pmH)e|^92*Zci>f4=f*tb7`4s8gN1U}W-& zwE^?}^sl7fBg+tn+8SvmJfNsci+VLZJVux1PMEJxLMev)j19&*l1w# zR`6x~%~?*HWp1U#9Q`?*!-fKn%u6-B>k>G5S}e9d>)96=g$rN1vDR|Nk^0=VH9te9 zX257K-O-x5*@iZBchAMsV4QRY6Pp+91F6~?hP=>-;6RacuplxhShQXs_M+3eRM+U+ zpQ4W`Cv&1%@W_fJV6LV17b8DnM}?6Jml8wHhno09psX(AcJDe>`^>!VteHY(H!Q@* zgUezQrEnn8DdS=8toDX^Uudi%2Acgy6J#`6F&S8&7(FWAF~z;UK*GG&=z9YLRHXpP*m_l9+U=Tsphgzc z$J+zPRS$t&@u;AwBAuTipAIaVf6)OWNU`7%V{g=;gE=Ry9LZP8_FsY1Bndb-tJHka z!{p~2u!$U8dwc>))l$LNq@=)5<$c$)N^{xmk@L2YtR4s4dQ-05c=;<|b}MbDs10um zPpQX(!&O#(AI~|ma-7s0J<}NqXh0Sk9w?O!Um@G>%%D*>nG;{%S)`K!Fs>i|7AuOC zVf%PANW;73DTr`^OaWX1Vffg%Lp7w=>pOZ{D0 zxtRi5%VRvGgE(N=pK|C)^Ax*$?5e1qwW0&of`dR-L^f`@8N$lU{oH4y=WPJZG^KzU z7@-*AoAcTwHycNpuYQLOni3%QyOVGxs)=0@8f>>~Dr6pR(Fy}KZhC#OX{-2U*DpFVMTqv|-~*i)fLNTq)oo@Bfp8LYs6aiAn@tRt%*i_#a86eO66+GbWIMOGRLxA*RWhwbFi|fFbf2g$J~@)c zsZ+UoL0l*3glhU?puf+pAd8^j)w($NwRaZUG-m4$t0%L#JR>722C>JsVGx8cwiEM^{fLdhXkau$;iPe*=OltKZR63*!qXpJsTJrBc!Wb0_j$yi za2AE?O9Qi)p`W`GSI8BuzSw{oUjH-{!gl)Vprvu&zf`%L5TnM&s1dg`srpCFk;i^p li9wDizlU=25^q@M0(U2mA4T0ii>|?KCYDHRW0Z*l{2zvEEnNTr delta 1359 zcmYL^e>~H99LKlsVtx!CHq?z$eq2sD6m@vqeQlUAR^$3X>11`8pKaN!MICD##jTHS zOA#I$BX#)^{WuR@KXg*$BxG_|I30OhDKyu)`^uv}e|o?E>s~$T)DSV`@l8+<^vPN*J^8H&Om27Iqic8uP!}s44o6OzAca0TvCU#6F z*$`=GjK3|A)ZT4}SxYj&@Ar{UN3%T{MVpTJqbp>4p}Affu&#`3omEjnG;;^#6RviB z@RXheP`CebHD^5wRk+=X_U@nl0XpalK%iFf}mp6X_4<2^uX5A2vW~2 z=0KNgBV4JsS$^FBzB4fc*YOeyVTPrjY-In0EN?9d+L#J~jOjWz9KH>0GIVJ;l+_jh z%T1HPnvQC{zJC*03N1N@$B#{cE6v1!qOtjecHSFpnSWN$)ga7<)n@Ua$L1bwdR9eO z-!wAcaAvOybOa)xv^;;Rnr)1h2CR;|yv4#6)__DX*s@ulT6}^1BWWd>P@xQf&gNpE z&^G2&64M#E6|PD5Vk`lyGZ%s@71A5I*-VxqeqAQqXVwBYTJS*Badl~4W?5ME(j)u& z``f!=orMf|ADymLG7g5yhl{_K?EvF2h%5mtr{!y3yL$$o*LEhf^$aYe zz2;SPYjj#Q35~4<;J0mx)ox=kfr@p~0pAjLxB7hRA<|+0D3-lF6^BO&nkREagowwk z17*@#GX%kVU=KB>BMZ8AQRju9K0)>25OnkN^Jf2N2!@D0-oRp~gdX9>B}uiX}ucGBq(cL@+HuH!wskG%+wSEjU9%FfBPZIYcr!MmaV#L^6GsKBoa2x3H!G zJ`Mplx9_w8p#u=m7$wpTrvX8Xz?YpV`DD_!ptu2SB?AOhB9{-|0Vx4ow>jPc#|L@y BFdP5? delta 146 zcmV;D0B!$(%m;wX2at#ZF>@iYi(MH3{FCV!u?)-r0007easU7X1z5AB8b$$w>>Ic2 z8v%rhB|IW12JNja*V{<#IyLiA<-vLUfVy^bn=w^pmH)e|^92*Zci>f4=f*tb7`4s8gN1U}W-& zwE^?}^sl7fBg+tn+8SvmJfNsci+VLZJVux1PMEJxLMev)j19&*l1w# zR`6x~%~?*HWp1U#9Q`?*!-fKn%u6-B>k>G5S}e9d>)96=g$rN1vDR|Nk^0=VH9te9 zX257K-O-x5*@iZBchAMsV4QRY6Pp+91F6~?hP=>-;6RacuplxhShQXs_M+3eRM+U+ zpQ4W`Cv&1%@W_fJV6LV17b8DnM}?6Jml8wHhno09psX(AcJDe>`^>!VteHY(H!Q@* zgUezQrEnn8DdS=8toDX^Uudi%2Acgy6J#`6F&S8&7(FWAF~z;UK*GG&=z9YLRHXpP*m_l9+U=Tsphgzc z$J+zPRS$t&@u;AwBAuTipAIaVf6)OWNU`7%V{g=;gE=Ry9LZP8_FsY1Bndb-tJHka z!{p~2u!$U8dwc>))l$LNq@=)5<$c$)N^{xmk@L2YtR4s4dQ-05c=;<|b}MbDs10um zPpQX(!&O#(AI~|ma-7s0J<}NqXh0Sk9w?O!Um@G>%%D*>nG;{%S)`K!Fs>i|7AuOC zVf%PANW;73DTr`^OaWX1Vffg%Lp7w=>pOZ{D0 zxtRi5%VRvGgE(N=pK|C)^Ax*$?5e1qwW0&of`dR-L^f`@8N$lU{oH4y=WPJZG^KzU z7@-*AoAcTwHycNpuYQLOni3%QyOVGxs)=0@8f>>~Dr6pR(Fy}KZhC#OX{-2U*DpFVMTqv|-~*i)fLNTq)oo@Bfp8LYs6aiAn@tRt%*i_#a86eO66+GbWIMOGRLxA*RWhwbFi|fFbf2g$J~@)c zsZ+UoL0l*3glhU?puf+pAd8^j)w($NwRaZUG-m4$t0%L#JR>722C>JsVGx8cwiEM^{fLdhXkau$;iPe*=OltKZR63*!qXpJsTJrBc!Wb0_j$yi za2AE?O9Qi)p`W`GSI8BuzSw{oUjH-{!gl)Vprvu&zf`%L5TnM&s1dg`srpCFk;i^p li9wDizlU=25^q@M0(U2mA4T0ii>|?KCYDHRW0Z*l{2zvEEnNTr delta 1359 zcmYL^e>~H99LKlsVtx!CHq?z$eq2sD6m@vqeQlUAR^$3X>11`8pKaN!MICD##jTHS zOA#I$BX#)^{WuR@KXg*$BxG_|I30OhDKyu)`^uv}e|o?E>s~$T)DSV`@l8+<^vPN*J^8H&Om27Iqic8uP!}s44o6OzAca0TvCU#6F z*$`=GjK3|A)ZT4}SxYj&@Ar{UN3%T{MVpTJqbp>4p}Affu&#`3omEjnG;;^#6RviB z@RXheP`CebHD^5wRk+=X_U@nl0XpalK%iFf}mp6X_4<2^uX5A2vW~2 z=0KNgBV4JsS$^FBzB4fc*YOeyVTPrjY-In0EN?9d+L#J~jOjWz9KH>0GIVJ;l+_jh z%T1HPnvQC{zJC*03N1N@$B#{cE6v1!qOtjecHSFpnSWN$)ga7<)n@Ua$L1bwdR9eO z-!wAcaAvOybOa)xv^;;Rnr)1h2CR;|yv4#6)__DX*s@ulT6}^1BWWd>P@xQf&gNpE z&^G2&64M#E6|PD5Vk`lyGZ%s@71A5I*-VxqeqAQqXVwBYTJS*Badl~4W?5ME(j)u& z``f!=orMf|ADymLG7g5yhl{_K?EvF2h%5mtr{!y3yL$$o*LEhf^$aYe zz2;SPYjj#Q35~4<;J0mx)ox=kfr@p~0pAjLxB7hRA<|+0D3-lF6^BO&nkREagowwk z17*@#GX%kVU=KB>BMZ8AQRju9K0)>25OnkN^Jf2N2!@D0-oRp~gdX9>B}uiX}ucGBq(cL@+HuH!wskG%+wSEjU9%FfBPZIYcr!MmaV#L^6GsKBoa2x3H!G zJ`Mplx9_w8p#u=m7$wpTrvX8Xz?YpV`DD_!ptu2SB?AOhB9{-|0Vx4ow>jPc#|L@y BFdP5? delta 146 zcmV;D0B!$(%m;wX2at#ZF>@iYi(MH3{FCV!u?)-r0007easU7X1z5AB8b$$w>>Ic2 z8v%rhB|IW12JNja*V{<#IyLiA<-vLUfVy^bn=w^pmH)e|^92*Zci>f4=f*tb7`4s8gN1U}W-& zwE^?}^sl7fBg+tn+8SvmJfNsci+VLZJVux1PMEJxLMev)j19&*l1w# zR`6x~%~?*HWp1U#9Q`?*!-fKn%u6-B>k>G5S}e9d>)96=g$rN1vDR|Nk^0=VH9te9 zX257K-O-x5*@iZBchAMsV4QRY6Pp+91F6~?hP=>-;6RacuplxhShQXs_M+3eRM+U+ zpQ4W`Cv&1%@W_fJV6LV17b8DnM}?6Jml8wHhno09psX(AcJDe>`^>!VteHY(H!Q@* zgUezQrEnn8DdS=8toDX^Uudi%2Acgy6J#`6F&S8&7(FWAF~z;UK*GG&=z9YLRHXpP*m_l9+U=Tsphgzc z$J+zPRS$t&@u;AwBAuTipAIaVf6)OWNU`7%V{g=;gE=Ry9LZP8_FsY1Bndb-tJHka z!{p~2u!$U8dwc>))l$LNq@=)5<$c$)N^{xmk@L2YtR4s4dQ-05c=;<|b}MbDs10um zPpQX(!&O#(AI~|ma-7s0J<}NqXh0Sk9w?O!Um@G>%%D*>nG;{%S)`K!Fs>i|7AuOC zVf%PANW;73DTr`^OaWX1Vffg%Lp7w=>pOZ{D0 zxtRi5%VRvGgE(N=pK|C)^Ax*$?5e1qwW0&of`dR-L^f`@8N$lU{oH4y=WPJZG^KzU z7@-*AoAcTwHycNpuYQLOni3%QyOVGxs)=0@8f>>~Dr6pR(Fy}KZhC#OX{-2U*DpFVMTqv|-~*i)fLNTq)oo@Bfp8LYs6aiAn@tRt%*i_#a86eO66+GbWIMOGRLxA*RWhwbFi|fFbf2g$J~@)c zsZ+UoL0l*3glhU?puf+pAd8^j)w($NwRaZUG-m4$t0%L#JR>722C>JsVGx8cwiEM^{fLdhXkau$;iPe*=OltKZR63*!qXpJsTJrBc!Wb0_j$yi za2AE?O9Qi)p`W`GSI8BuzSw{oUjH-{!gl)Vprvu&zf`%L5TnM&s1dg`srpCFk;i^p li9wDizlU=25^q@M0(U2mA4T0ii>|?KCYDHRW0Z*l{2zvEEnNTr delta 1359 zcmYL^e>~H99LKlsVtx!CHq?z$eq2sD6m@vqeQlUAR^$3X>11`8pKaN!MICD##jTHS zOA#I$BX#)^{WuR@KXg*$BxG_|I30OhDKyu)`^uv}e|o?E>s~$T)DSV`@l8+<^vPN*J^8H&Om27Iqic8uP!}s44o6OzAca0TvCU#6F z*$`=GjK3|A)ZT4}SxYj&@Ar{UN3%T{MVpTJqbp>4p}Affu&#`3omEjnG;;^#6RviB z@RXheP`CebHD^5wRk+=X_U@nl0XpalK%iFf}mp6X_4<2^uX5A2vW~2 z=0KNgBV4JsS$^FBzB4fc*YOeyVTPrjY-In0EN?9d+L#J~jOjWz9KH>0GIVJ;l+_jh z%T1HPnvQC{zJC*03N1N@$B#{cE6v1!qOtjecHSFpnSWN$)ga7<)n@Ua$L1bwdR9eO z-!wAcaAvOybOa)xv^;;Rnr)1h2CR;|yv4#6)__DX*s@ulT6}^1BWWd>P@xQf&gNpE z&^G2&64M#E6|PD5Vk`lyGZ%s@71A5I*-VxqeqAQqXVwBYTJS*Badl~4W?5ME(j)u& z``f!=orMf|ADymLG7g5yhl{_K?EvF2h%5mtr{!y3yL$$o*LEhf^$aYe zz2;SPYjj#Q35~4<;J0mx)ox=kfr@p~0pAjLxB7hRA<|+0D3-lF6^BO&nkREagowwk z17*@#GX%kVU=KB>BMZ8AQRju9K0)>25OnkN^Jf2N2!@D0-oRp~gdX9 { + Debug.Log("Callback A"); + MoveSpriteToPoint(new Vector3(0, 0, 0)); + }); + if (midIntervals) s.AppendInterval(0.5f); + s.AppendCallback(()=> { + Debug.Log("Callback B"); + MoveSpriteToPoint(new Vector3(2, 0, 0)); + }); + if (midIntervals) s.AppendInterval(0.5f); + } else { + s.Append(target.DOMoveX(3, 0.5f)); + s.Append(target.DORotate(new Vector3(0, 180, 0), 0.5f)); + } + } + + void MoveSpriteToPoint(Vector3 destPos) + { + target.DOMove(destPos, 0.5f); + } +} \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/Bugs/LoopTypeRestart.cs.meta b/UnityTests.Unity5/Assets/_Tests/Bugs/LoopTypeRestart.cs.meta new file mode 100644 index 0000000..ef704ed --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/Bugs/LoopTypeRestart.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c653f77de1feeea4ab81f7ba9737d3cc +timeCreated: 1428310452 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/Bugs/LoopTypeRestart.unity b/UnityTests.Unity5/Assets/_Tests/Bugs/LoopTypeRestart.unity new file mode 100644 index 0000000000000000000000000000000000000000..3ade9b8dbe9bd2975d5047e7ddd4fcbb87ec59cd GIT binary patch literal 13256 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 literal 0 HcmV?d00001 diff --git a/UnityTests.Unity5/Assets/_Tests/Bugs/LoopTypeRestart.unity.meta b/UnityTests.Unity5/Assets/_Tests/Bugs/LoopTypeRestart.unity.meta new file mode 100644 index 0000000..3a01439 --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/Bugs/LoopTypeRestart.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b788bdeb5ca734542ba694693885cdfe +timeCreated: 1428310441 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.unity b/UnityTests.Unity5/Assets/_Tests/TempTests.unity index 9a1d13d07aba40d94217d864cc3b5624e33f6dc6..cb2479d235562978a08c8d299ce462416f486f1c 100644 GIT binary patch delta 80 zcmeB4=t*EDOTween's version - public static readonly string Version = "1.0.435"; + public static readonly string Version = "1.0.437"; /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTween/Sequence.cs b/_DOTween.Assembly/DOTween/Sequence.cs index 431a19a..4a1230c 100644 --- a/_DOTween.Assembly/DOTween/Sequence.cs +++ b/_DOTween.Assembly/DOTween/Sequence.cs @@ -188,8 +188,9 @@ namespace DG.Tweening if (s.isBackwards) prevPosIsInverse = !prevPosIsInverse; // Update multiple loop cycles within the same update if (newCompletedSteps > 0) { +// Debug.Log(Time.frameCount + " newCompletedSteps = " + newCompletedSteps + " - completedLoops: " + s.completedLoops + " - updateMode: " + updateMode); // Store expected completedLoops and position, in order to check them after the update cycles. - int expectedCompletedLoops = s.completedLoops + newCompletedSteps; + int expectedCompletedLoops = s.completedLoops; float expectedPosition = s.position; // int cycles = newCompletedSteps; @@ -206,6 +207,7 @@ namespace DG.Tweening if (s.loopType == LoopType.Yoyo) prevPosIsInverse = !prevPosIsInverse; } // If completedLoops or position were changed by some callback, exit here +// Debug.Log(" Internal Cycle Ended > expecteCompletedLoops/completedLoops: " + expectedCompletedLoops + "/" + s.completedLoops + " - expectedPosition/position: " + expectedPosition + "/" + s.position); if (expectedCompletedLoops != s.completedLoops || Math.Abs(expectedPosition - s.position) > Single.Epsilon) return !s.active; } else { // Simply determine correct prevPosition after steps @@ -233,7 +235,7 @@ namespace DG.Tweening static bool ApplyInternalCycle(Sequence s, float fromPos, float toPos, UpdateMode updateMode, bool useInverse, bool prevPosIsInverse, bool multiCycleStep = false) { bool isBackwardsUpdate = toPos < fromPos; -// Debug.Log(Time.frameCount + " " + s.id + " " + (multiCycleStep ? "Multicycle > " : "Cycle > ") + s.position + "/" + s.duration + " - s.isBackwards: " + s.isBackwards + ", useInverse/prevInverse: " + useInverse + "/" + prevPosIsInverse + " - " + fromPos + " > " + toPos + " - UpdateMode: " + updateMode + ", isPlaying: " + s.isPlaying); +// Debug.Log(Time.frameCount + " " + s.id + " " + (multiCycleStep ? "Multicycle > " : "Cycle > ") + s.position + "/" + s.duration + " - s.isBackwards: " + s.isBackwards + ", useInverse/prevInverse: " + useInverse + "/" + prevPosIsInverse + " - " + fromPos + " > " + toPos + " - UpdateMode: " + updateMode + ", isPlaying: " + s.isPlaying + ", completedLoops: " + s.completedLoops); if (isBackwardsUpdate) { int len = s._sequencedObjs.Count - 1; for (int i = len; i > -1; --i) { diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index a717f6254962bd660df041fb23dc60828bca2b8a..394269d0e1c629c36fcda3369f78f5497bd036c6 100644 GIT binary patch delta 147 zcmV;E0Brw&%m;wX2at#Z1XLoii(MH3`jhDyu?orn0007easU7Xv!)tG0RjL3gX|l( z>>B}uiX}ucGBq(cL@+HuH!wskG%+wSEjU9%FfBPZIYcr!MmaV#L^6GsKBoa2x3H!G zJ`Mplx9_w8p#u=m7$wpTrvX8Xz?YpV`DD_!ptu2SB?AOhB9{-|0Vx4ow>jPc#|L@y BFdP5? delta 146 zcmV;D0B!$(%m;wX2at#ZF>@iYi(MH3{FCV!u?)-r0007easU7X1z5AB8b$$w>>Ic2 z8v%rhB|IW12JNja*V{<#IyLiA<-vLUfVy^bn=w^pmH)e|^92*Zci>f4=f*tb7`4s8gN1U}W-& zwE^?}^sl7fBg+tn+8SvmJfNsci+VLZJVux1PMEJxLMev)j19&*l1w# zR`6x~%~?*HWp1U#9Q`?*!-fKn%u6-B>k>G5S}e9d>)96=g$rN1vDR|Nk^0=VH9te9 zX257K-O-x5*@iZBchAMsV4QRY6Pp+91F6~?hP=>-;6RacuplxhShQXs_M+3eRM+U+ zpQ4W`Cv&1%@W_fJV6LV17b8DnM}?6Jml8wHhno09psX(AcJDe>`^>!VteHY(H!Q@* zgUezQrEnn8DdS=8toDX^Uudi%2Acgy6J#`6F&S8&7(FWAF~z;UK*GG&=z9YLRHXpP*m_l9+U=Tsphgzc z$J+zPRS$t&@u;AwBAuTipAIaVf6)OWNU`7%V{g=;gE=Ry9LZP8_FsY1Bndb-tJHka z!{p~2u!$U8dwc>))l$LNq@=)5<$c$)N^{xmk@L2YtR4s4dQ-05c=;<|b}MbDs10um zPpQX(!&O#(AI~|ma-7s0J<}NqXh0Sk9w?O!Um@G>%%D*>nG;{%S)`K!Fs>i|7AuOC zVf%PANW;73DTr`^OaWX1Vffg%Lp7w=>pOZ{D0 zxtRi5%VRvGgE(N=pK|C)^Ax*$?5e1qwW0&of`dR-L^f`@8N$lU{oH4y=WPJZG^KzU z7@-*AoAcTwHycNpuYQLOni3%QyOVGxs)=0@8f>>~Dr6pR(Fy}KZhC#OX{-2U*DpFVMTqv|-~*i)fLNTq)oo@Bfp8LYs6aiAn@tRt%*i_#a86eO66+GbWIMOGRLxA*RWhwbFi|fFbf2g$J~@)c zsZ+UoL0l*3glhU?puf+pAd8^j)w($NwRaZUG-m4$t0%L#JR>722C>JsVGx8cwiEM^{fLdhXkau$;iPe*=OltKZR63*!qXpJsTJrBc!Wb0_j$yi za2AE?O9Qi)p`W`GSI8BuzSw{oUjH-{!gl)Vprvu&zf`%L5TnM&s1dg`srpCFk;i^p li9wDizlU=25^q@M0(U2mA4T0ii>|?KCYDHRW0Z*l{2zvEEnNTr delta 1359 zcmYL^e>~H99LKlsVtx!CHq?z$eq2sD6m@vqeQlUAR^$3X>11`8pKaN!MICD##jTHS zOA#I$BX#)^{WuR@KXg*$BxG_|I30OhDKyu)`^uv}e|o?E>s~$T)DSV`@l8+<^vPN*J^8H&Om27Iqic8uP!}s44o6OzAca0TvCU#6F z*$`=GjK3|A)ZT4}SxYj&@Ar{UN3%T{MVpTJqbp>4p}Affu&#`3omEjnG;;^#6RviB z@RXheP`CebHD^5wRk+=X_U@nl0XpalK%iFf}mp6X_4<2^uX5A2vW~2 z=0KNgBV4JsS$^FBzB4fc*YOeyVTPrjY-In0EN?9d+L#J~jOjWz9KH>0GIVJ;l+_jh z%T1HPnvQC{zJC*03N1N@$B#{cE6v1!qOtjecHSFpnSWN$)ga7<)n@Ua$L1bwdR9eO z-!wAcaAvOybOa)xv^;;Rnr)1h2CR;|yv4#6)__DX*s@ulT6}^1BWWd>P@xQf&gNpE z&^G2&64M#E6|PD5Vk`lyGZ%s@71A5I*-VxqeqAQqXVwBYTJS*Badl~4W?5ME(j)u& z``f!=orMf|ADymLG7g5yhl{_K?EvF2h%5mtr{!y3yL$$o*LEhf^$aYe zz2;SPYjj#Q35~4<;J0mx)ox=kfr@p~0pAjLxB7hRA<|+0D3-lF6^BO&nkREagowwk z17*@#GX%kVU=KB>BMZ8AQRju9K0)>25OnkN^Jf2N2!@D0-oRp~gdX9