Merge branch 'clay-improvements' of https://github.com/Hextris/hextris into clay-improvements
This commit is contained in:
lengstrom
commit
851b600c00
13 changed files with 156 additions and 10 deletions
15
images/btn_back.svg
Normal file
15
images/btn_back.svg
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="75px" height="65px" viewBox="0 0 75 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
|
||||
<!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Back button</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<g id="About" sketch:type="MSArtboardGroup" transform="translate(-10.000000, -10.000000)">
|
||||
<g id="Back-button" sketch:type="MSLayerGroup" transform="translate(10.000000, 5.000000)">
|
||||
<polygon id="Back-hex" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(37.500000, 37.500000) rotate(-90.000000) translate(-37.500000, -37.500000) " points="37.5 0 69.9759526 18.75 69.9759526 56.25 37.5 75 5.02404736 56.25 5.02404736 18.75 "></polygon>
|
||||
<path d="M52,36.25 L30.7025,36.25 L40.47625,26.47625 L38,24 L24,38 L38,52 L40.47625,49.52375 L30.7025,39.75 L52,39.75 L52,36.25 L52,36.25 Z" id="Back-arrow" fill="#2C3E50" sketch:type="MSShapeGroup"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
19
images/btn_facebook.svg
Normal file
19
images/btn_facebook.svg
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="75px" height="65px" viewBox="0 0 75 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
|
||||
<!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Facebook</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<g id="Start-screen" sketch:type="MSArtboardGroup" transform="translate(-143.000000, -530.000000)">
|
||||
<g id="Help-+-Social" sketch:type="MSLayerGroup" transform="translate(48.000000, 525.000000)">
|
||||
<g id="Social" transform="translate(95.000000, 0.000000)" sketch:type="MSShapeGroup">
|
||||
<g id="Facebook">
|
||||
<polygon id="Score-hex-2" fill="#3C5B9A" transform="translate(37.500000, 37.500000) rotate(-90.000000) translate(-37.500000, -37.500000) " points="37.5 0 69.9759526 18.75 69.9759526 56.25 37.5 75 5.02404736 56.25 5.02404736 18.75 "></polygon>
|
||||
<path d="M43.093578,27.9857143 L46,27.9857143 L46,23.2142857 C45.5009174,23.1428571 43.7834862,23 41.7724771,23 C37.5889908,23 34.7266055,25.4857143 34.7266055,30.0428571 L34.7266055,33.9714286 L30,33.9714286 L30,39.3 L34.7266055,39.3 L34.7266055,53 L40.3779817,53 L40.3779817,39.3142857 L45.0899083,39.3142857 L45.7944954,33.9857143 L40.3779817,33.9857143 L40.3779817,30.5714286 C40.3779817,29.0285714 40.8183486,27.9857143 43.093578,27.9857143 L43.093578,27.9857143 Z" id="Shape" fill="#FFFFFF"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.7 KiB |
17
images/btn_help.svg
Normal file
17
images/btn_help.svg
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="75px" height="65px" viewBox="0 0 75 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
|
||||
<!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Help</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<g id="Start-screen" sketch:type="MSArtboardGroup" transform="translate(-48.000000, -530.000000)">
|
||||
<g id="Help-+-Social" sketch:type="MSLayerGroup" transform="translate(48.000000, 525.000000)">
|
||||
<g id="Help" sketch:type="MSShapeGroup">
|
||||
<polygon id="Score-hex-4" fill="#BDC3C7" transform="translate(37.500000, 37.500000) rotate(-90.000000) translate(-37.500000, -37.500000) " points="37.5 0 69.9759526 18.75 69.9759526 56.25 37.5 75 5.02404736 56.25 5.02404736 18.75 "></polygon>
|
||||
<path d="M29.1793249,28.7921348 L29,25.8075843 C29.2151909,25.7607676 29.6097018,25.6846915 30.1835443,25.5793539 C30.7573868,25.4740163 31.1459202,25.4096443 31.3491561,25.386236 C31.552392,25.3628276 31.9110382,25.3160116 32.4251055,25.2457865 C32.9391728,25.1755614 33.3874805,25.1287454 33.7700422,25.1053371 C34.1526039,25.0819287 34.6547086,25.0585207 35.2763713,25.0351124 C35.8980341,25.011704 36.567507,25 37.2848101,25 C39.7953712,25 41.6663089,25.4447521 42.8976793,26.3342697 C44.1290498,27.2237872 44.7447257,28.5931555 44.7447257,30.4424157 C44.7447257,31.4021584 44.5355155,32.2858106 44.1170886,33.0933989 C43.6986618,33.9009872 43.1846022,34.6090794 42.5748945,35.2176966 C41.9651868,35.8263139 41.3554883,36.4466261 40.7457806,37.0786517 C40.1360729,37.7106773 39.5981036,38.4831415 39.1318565,39.3960674 C38.6656095,40.3089933 38.3966248,41.3155376 38.3248945,42.4157303 L34.7025316,42.4157303 C34.6786215,41.2453125 34.8400123,40.1626922 35.1867089,39.1678371 C35.5334054,38.1729819 35.9697583,37.3419977 36.4957806,36.6748596 C37.0218029,36.0077214 37.5537948,35.3815572 38.0917722,34.7963483 C38.6297495,34.2111394 39.101967,33.6200873 39.5084388,33.0231742 C39.9149106,32.4262611 40.1300983,31.8352089 40.1540084,31.25 C40.2018286,30.3136657 39.9208891,29.6289816 39.3111814,29.195927 C38.7014737,28.7628724 37.7032418,28.5463483 36.3164557,28.5463483 C34.4036473,28.5463483 32.0246274,28.6282763 29.1793249,28.7921348 L29.1793249,28.7921348 Z M35.9936709,45.1896067 L37.0337553,45.1896067 C37.6315079,45.1896067 38.043951,45.3007948 38.271097,45.5231742 C38.498243,45.7455535 38.6118143,46.1376376 38.6118143,46.6994382 L38.6118143,48.4901685 C38.6118143,49.0519691 38.498243,49.4440532 38.271097,49.6664326 C38.043951,49.888812 37.6315079,50 37.0337553,50 L35.9936709,50 C35.3959182,50 34.9834751,49.888812 34.7563291,49.6664326 C34.5291831,49.4440532 34.4156118,49.0519691 34.4156118,48.4901685 L34.4156118,46.6994382 C34.4156118,46.1376376 34.5291831,45.7455535 34.7563291,45.5231742 C34.9834751,45.3007948 35.3959182,45.1896067 35.9936709,45.1896067 L35.9936709,45.1896067 Z" id="?" fill="#FFFFFF"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.2 KiB |
15
images/btn_pause.svg
Normal file
15
images/btn_pause.svg
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="75px" height="65px" viewBox="0 0 75 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
|
||||
<!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Pause button</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<g id="New-game" sketch:type="MSArtboardGroup" transform="translate(-275.000000, -565.000000)">
|
||||
<g id="Pause-button" sketch:type="MSLayerGroup" transform="translate(275.000000, 560.000000)">
|
||||
<polygon id="Pause-hex" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(37.500000, 37.500000) rotate(-90.000000) translate(-37.500000, -37.500000) " points="37.5 0 69.9759526 18.75 69.9759526 56.25 37.5 75 5.02404736 56.25 5.02404736 18.75 "></polygon>
|
||||
<path d="M26,52 L34,52 L34,24 L26,24 L26,52 L26,52 Z M42,24 L42,52 L50,52 L50,24 L42,24 L42,24 Z" id="Pause-shape" fill="#2C3E50" sketch:type="MSShapeGroup"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
15
images/btn_restart.svg
Normal file
15
images/btn_restart.svg
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="75px" height="65px" viewBox="0 0 75 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
|
||||
<!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Restart button</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<g id="Paused" sketch:type="MSArtboardGroup" transform="translate(-10.000000, -565.000000)">
|
||||
<g id="Restart-button" sketch:type="MSLayerGroup" transform="translate(10.000000, 560.000000)">
|
||||
<polygon id="Score-hex-4" fill="#F1C40F" sketch:type="MSShapeGroup" transform="translate(37.500000, 37.500000) rotate(-90.000000) translate(-37.500000, -37.500000) " points="37.5 0 69.9759526 18.75 69.9759526 56.25 37.5 75 5.02404736 56.25 5.02404736 18.75 "></polygon>
|
||||
<path d="M47.8849281,28.1125 C45.3545966,25.575 41.8611632,24 37.9912445,24 C30.2514071,24 24,30.265 24,38 C24,45.735 30.2514071,52 37.9912445,52 C44.5140713,52 49.9774859,47.5375 51.5272045,41.5 L47.8849281,41.5 C46.4402752,45.5775 42.5703565,48.5 37.9912445,48.5 C32.1863665,48.5 27.4846779,43.80125 27.4846779,38 C27.4846779,32.19875 32.1863665,27.5 37.9912445,27.5 C40.8893058,27.5 43.4896811,28.7075 45.3896185,30.60625 L39.742339,36.25 L52,36.25 L52,24 L47.8849281,28.1125 L47.8849281,28.1125 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.6 KiB |
15
images/btn_resume.svg
Normal file
15
images/btn_resume.svg
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="75px" height="65px" viewBox="0 0 75 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
|
||||
<!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Resume button</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<g id="Paused" sketch:type="MSArtboardGroup" transform="translate(-275.000000, -565.000000)">
|
||||
<g id="Resume-button" sketch:type="MSLayerGroup" transform="translate(275.000000, 560.000000)">
|
||||
<polygon id="Pause-hex" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(37.500000, 37.500000) rotate(-90.000000) translate(-37.500000, -37.500000) " points="37.5 0 69.9759526 18.75 69.9759526 56.25 37.5 75 5.02404736 56.25 5.02404736 18.75 "></polygon>
|
||||
<path d="M26,24 L26,52 L49,38 L26,24 Z" id="Play-icon" fill="#2C3E50" sketch:type="MSShapeGroup"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.2 KiB |
17
images/btn_share.svg
Normal file
17
images/btn_share.svg
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="255px" height="65px" viewBox="0 0 255 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
|
||||
<!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Share button</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<g id="Game-over-" sketch:type="MSArtboardGroup" transform="translate(-95.000000, -565.000000)">
|
||||
<g id="Share-button" sketch:type="MSLayerGroup" transform="translate(95.000000, 565.000000)">
|
||||
<polygon id="Score-hex-2" fill="#3498DB" sketch:type="MSShapeGroup" transform="translate(127.661316, 32.500000) rotate(-90.000000) translate(-127.661316, -32.500000) " points="127.661316 -94.814636 160.137269 -76.064636 160.137269 141.064636 127.661317 159.814636 95.185364 141.064636 95.1853635 -76.064636 "></polygon>
|
||||
<text id="SHARE-MY-SCORE!" sketch:type="MSTextLayer" font-family="Exo 2" font-size="16" font-weight="420" fill="#FFFFFF">
|
||||
<tspan x="67" y="39">SHARE MY SCORE!</tspan>
|
||||
</text>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
19
images/btn_twitter.svg
Normal file
19
images/btn_twitter.svg
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="75px" height="65px" viewBox="0 0 75 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
|
||||
<!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Twitter</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<g id="Start-screen" sketch:type="MSArtboardGroup" transform="translate(-238.000000, -530.000000)">
|
||||
<g id="Help-+-Social" sketch:type="MSLayerGroup" transform="translate(48.000000, 525.000000)">
|
||||
<g id="Social" transform="translate(95.000000, 0.000000)" sketch:type="MSShapeGroup">
|
||||
<g id="Twitter" transform="translate(95.000000, 0.000000)">
|
||||
<polygon id="Score-hex-3" fill="#55ACEE" transform="translate(37.500000, 37.500000) rotate(-90.000000) translate(-37.500000, -37.500000) " points="37.5 0 69.9759526 18.75 69.9759526 56.25 37.5 75 5.02404736 56.25 5.02404736 18.75 "></polygon>
|
||||
<path d="M53,27.9545455 C51.9041096,28.4615385 50.7054795,28.7937063 49.4726027,28.951049 C50.739726,28.1643357 51.7157534,26.9405594 52.1780822,25.4545455 C50.9965753,26.1713287 49.6780822,26.6958042 48.2739726,26.993007 C47.1609589,25.7692308 45.5513699,25 43.7876712,25 C40.3972603,25 37.640411,27.8321678 37.640411,31.3111888 C37.640411,31.8006993 37.6917808,32.2902098 37.7945205,32.7447552 C32.6917808,32.4825175 28.1541096,29.965035 25.1232877,26.1538462 C24.5924658,27.0804196 24.2842466,28.1643357 24.2842466,29.3181818 C24.2842466,31.5034965 25.3630137,33.4440559 27.0239726,34.5629371 C26.0136986,34.527972 25.0719178,34.2482517 24.2328767,33.7762238 L24.2328767,33.8636364 C24.2328767,36.9230769 26.3561644,39.4755245 29.1643836,40.0524476 C28.6506849,40.1923077 28.1027397,40.2797203 27.5376712,40.2797203 C27.1438356,40.2797203 26.75,40.2447552 26.3732877,40.1748252 C27.1609589,42.6748252 29.4212329,44.5104895 32.109589,44.5629371 C30.0034247,46.2587413 27.3493151,47.2727273 24.4726027,47.2727273 C23.9760274,47.2727273 23.4794521,47.2377622 23,47.1853147 C25.7568493,48.951049 28.9931507,50 32.4520548,50 C43.7534247,50 49.9520548,40.3846154 49.9520548,32.0454545 C49.9520548,31.7657343 49.9520548,31.5034965 49.9349315,31.2237762 C51.1335616,30.3321678 52.1780822,29.2307692 53,27.9545455 L53,27.9545455 Z" id="Shape" fill="#FFFFFF"></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.6 KiB |
14
images/icon_arrows.svg
Normal file
14
images/icon_arrows.svg
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg width="36px" height="19px" viewBox="0 0 36 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
|
||||
<!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
|
||||
<title>Arrows icon</title>
|
||||
<desc>Created with Sketch.</desc>
|
||||
<defs></defs>
|
||||
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
|
||||
<g id="New-game" sketch:type="MSArtboardGroup" transform="translate(-162.000000, -146.000000)" fill="#2C3E50">
|
||||
<g id="Tutorial" sketch:type="MSLayerGroup" transform="translate(50.000000, 96.000000)">
|
||||
<path d="M130,47.49 L136.34,53.83 L139.17,51 L130,41.83 L120.83,51 L123.66,53.83 L130,47.49 L130,47.49 Z M130,72.17 L123.66,65.83 L120.83,68.66 L130,77.83 L139.17,68.66 L136.34,65.83 L130,72.17 L130,72.17 Z" id="Arrows-icon" sketch:type="MSShapeGroup" transform="translate(130.000000, 59.830000) rotate(-90.000000) translate(-130.000000, -59.830000) "></path>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
|
|
@ -82,8 +82,7 @@
|
|||
</div>
|
||||
<img id="openSideBar" class = 'helpText' src="./images/btn_help.svg" />
|
||||
<div class="faded overlay"></div>
|
||||
<div id = 'pauseBtn'><div id = 'pauseBtnInner'><img src="./images/btn_pause.svg" /></div></div>
|
||||
<div id = 'pauseBtn'><div id = 'pauseBtnInner'><img src="./images/btn_pause.svg" /></div></div>
|
||||
<img id="pauseBtn" src="./images/btn_pause.svg" />
|
||||
<div id = 'restartBtn'><div id = 'restartBtnInner'><img src="./images/btn_restart.svg" /></div></div>
|
||||
<div id="bottombar">
|
||||
<div style="bottom:4px; padding-right:4px;" class="fb-like" data-href="http://hextris.github.io/hextris" data-width="20" data-layout="button_count" data-action="like" data-show-faces="false" data-share="true"></div>
|
||||
|
|
|
|||
|
|
@ -75,6 +75,8 @@ function addKeyListeners() {
|
|||
});
|
||||
|
||||
$("#pauseBtn").on('touchstart mousedown', function() {
|
||||
|
||||
alert("hey");
|
||||
if (gameState != 1 && gameState != -1) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -82,7 +84,6 @@ function addKeyListeners() {
|
|||
if ($('#helpScreen').is(":visible")) {
|
||||
$('#helpScreen').fadeOut(150, "linear");
|
||||
}
|
||||
alert("hey");
|
||||
pause();
|
||||
return false;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ function init(b) {
|
|||
}
|
||||
|
||||
infobuttonfading = true;
|
||||
$("#pauseBtnInner").html('<img src="./images/btn_pause.svg">');
|
||||
$("#pauseBtn").html('<img src="./images/btn_pause.svg">');
|
||||
hideUIElements();
|
||||
var saveState = localStorage.getItem("saveState") || "{}";
|
||||
saveState = JSONfn.parse(saveState);
|
||||
|
|
@ -331,7 +331,7 @@ function showHelp() {
|
|||
pause();
|
||||
}
|
||||
|
||||
if($("#pauseBtnInner").children()[0].src.replace(/^.*[\\\/]/, '') == "btn_pause.svg" && gameState != 0 && !infobuttonfading) {
|
||||
if($("#pauseBtn").children()[0].src.replace(/^.*[\\\/]/, '') == "btn_pause.svg" && gameState != 0 && !infobuttonfading) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -155,10 +155,10 @@ function setMainMenu() {
|
|||
canRestart = 's';
|
||||
}, 500);
|
||||
$('#restartBtn').hide();
|
||||
if ($($("#pauseBtn").children()[0]).replace(/^.*[\\\/]/, '') == "btn_pause.svg") {
|
||||
$("#pauseBtnInner").html('<img src="./images/btn_pause.svg" />');
|
||||
if ($("#pauseBtn").replace(/^.*[\\\/]/, '') == "btn_pause.svg") {
|
||||
$("#pauseBtn").attr("src","./images/btn_resume.svg");
|
||||
} else {
|
||||
$("#pauseBtnInner").html('<img src="./images/btn_resume.svg" />');
|
||||
$("#pauseBtn").attr("src","./images/btn_pause.svg");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -230,7 +230,7 @@ function pause(o) {
|
|||
$('#helpScreen').fadeOut(150, "linear");
|
||||
}
|
||||
|
||||
$("#pauseBtnInner").html('<img src="./images/btn_resume.svg" />');
|
||||
$("#pauseBtn").attr("src", "./images/btn_pause.svg");
|
||||
$('.helpText').fadeOut(200, 'linear');
|
||||
hideText();
|
||||
hidebottombar();
|
||||
|
|
@ -245,7 +245,7 @@ function pause(o) {
|
|||
showText(message);
|
||||
}
|
||||
|
||||
$("#pauseBtnInner").html('<img src="./images/btn_resume.svg" />');
|
||||
$("#pauseBtn").attr("src","./images/btn_resume.svg");
|
||||
prevGameState = gameState;
|
||||
gameState = -1;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue