Browse Source

吸血鬼日志wap,古剑专题

baichun 6 năm trước cách đây
mục cha
commit
40f3e9d2d1

BIN
2018专题/1807吸血鬼专题Wap-商务/src/img/atlas/icon-1.png


+ 46 - 0
2018专题/1807吸血鬼专题Wap-商务/src/img/atlas/icon.less

@@ -0,0 +1,46 @@
+//
+// Created with TexturePacker http://www.codeandweb.com/texturepacker
+//
+// SmartUpdateHash: $TexturePacker:SmartUpdate:122a4a52ea93b15bfa55dfdacc4cff29$
+//
+
+.sprite-icon { display:inline-block; overflow: hidden; background-repeat: no-repeat; background-image: url('icon.png'); }
+
+.icon-fg_00000 { width: 52px; height: 72px; background-position: -458px -316px; }
+.icon-fg_00001 { width: 52px; height: 72px; background-position: -404px -316px; }
+.icon-fg_00002 { width: 52px; height: 72px; background-position: -350px -414px; }
+.icon-fg_00003 { width: 54px; height: 74px; background-position: -412px -240px; }
+.icon-fg_00004 { width: 54px; height: 74px; background-position: -296px -264px; }
+.icon-fg_00005 { width: 56px; height: 76px; background-position: -418px -162px; }
+.icon-fg_00006 { width: 58px; height: 76px; background-position: -296px -80px; }
+.icon-fg_00007 { width: 60px; height: 80px; background-position: -418px -2px; }
+.icon-fg_00008 { width: 62px; height: 82px; background-position: -292px -180px; }
+.icon-fg_00009 { width: 64px; height: 84px; background-position: -230px -2px; }
+.icon-fg_00010 { width: 66px; height: 84px; background-position: -228px -94px; }
+.icon-fg_00011 { width: 68px; height: 86px; background-position: -226px -278px; }
+.icon-fg_00012 { width: 70px; height: 90px; background-position: -158px -2px; }
+.icon-fg_00013 { width: 72px; height: 92px; background-position: -154px -382px; }
+.icon-fg_00014 { width: 74px; height: 92px; background-position: -80px -288px; }
+.icon-fg_00015 { width: 74px; height: 92px; background-position: -80px -194px; }
+.icon-fg_00016 { width: 76px; height: 94px; background-position: -2px -388px; }
+.icon-fg_00017 { width: 76px; height: 94px; background-position: -2px -292px; }
+.icon-fg_00018 { width: 78px; height: 96px; background-position: -2px -2px; }
+.icon-fg_00019 { width: 76px; height: 94px; background-position: -2px -196px; }
+.icon-fg_00020 { width: 76px; height: 94px; background-position: -2px -100px; }
+.icon-fg_00021 { width: 74px; height: 92px; background-position: -82px -2px; }
+.icon-fg_00022 { width: 74px; height: 92px; background-position: -80px -100px; }
+.icon-fg_00023 { width: 72px; height: 92px; background-position: -80px -382px; }
+.icon-fg_00024 { width: 70px; height: 90px; background-position: -156px -96px; }
+.icon-fg_00025 { width: 70px; height: 88px; background-position: -156px -188px; }
+.icon-fg_00026 { width: 68px; height: 86px; background-position: -156px -278px; }
+.icon-fg_00027 { width: 66px; height: 84px; background-position: -228px -366px; }
+.icon-fg_00028 { width: 62px; height: 82px; background-position: -228px -180px; }
+.icon-fg_00029 { width: 60px; height: 80px; background-position: -356px -2px; }
+.icon-fg_00030 { width: 60px; height: 78px; background-position: -356px -84px; }
+.icon-fg_00031 { width: 58px; height: 76px; background-position: -296px -2px; }
+.icon-fg_00032 { width: 56px; height: 76px; background-position: -418px -84px; }
+.icon-fg_00033 { width: 54px; height: 74px; background-position: -356px -240px; }
+.icon-fg_00034 { width: 54px; height: 74px; background-position: -356px -164px; }
+.icon-fg_00035 { width: 52px; height: 72px; background-position: -350px -340px; }
+.icon-fg_00036 { width: 52px; height: 72px; background-position: -296px -414px; }
+.icon-fg_00037 { width: 52px; height: 72px; background-position: -296px -340px; }

BIN
2018专题/1807吸血鬼专题Wap-商务/src/img/atlas/icon.png


+ 57 - 0
2018专题/1807吸血鬼专题Wap-商务/src/img/atlas/light.less

@@ -0,0 +1,57 @@
+//
+// Created with TexturePacker http://www.codeandweb.com/texturepacker
+//
+// SmartUpdateHash: $TexturePacker:SmartUpdate:bdb563b1ef676936a128d073a3b350fc$
+//
+
+.sprite-light { display:inline-block; overflow: hidden; background-repeat: no-repeat; background-image: url('light.png'); }
+
+.light-gy_00001 { width: 4px; height: 4px; background-position: -504px -94px; }
+.light-gy_00002 { width: 10px; height: 8px; background-position: -500px -134px; }
+.light-gy_00003 { width: 14px; height: 14px; background-position: -140px -178px; }
+.light-gy_00004 { width: 18px; height: 18px; background-position: -140px -158px; }
+.light-gy_00005 { width: 22px; height: 22px; background-position: -488px -254px; }
+.light-gy_00006 { width: 26px; height: 26px; background-position: -460px -254px; }
+.light-gy_00007 { width: 30px; height: 30px; background-position: -460px -222px; }
+.light-gy_00008 { width: 34px; height: 34px; background-position: -464px -134px; }
+.light-gy_00009 { width: 38px; height: 38px; background-position: -464px -94px; }
+.light-gy_00010 { width: 42px; height: 42px; background-position: -464px -50px; }
+.light-gy_00011 { width: 46px; height: 46px; background-position: -464px -2px; }
+.light-gy_00012 { width: 50px; height: 50px; background-position: -460px -170px; }
+.light-gy_00013 { width: 54px; height: 54px; background-position: -326px -598px; }
+.light-gy_00014 { width: 60px; height: 58px; background-position: -326px -538px; }
+.light-gy_00015 { width: 64px; height: 62px; background-position: -308px -794px; }
+.light-gy_00016 { width: 68px; height: 66px; background-position: -308px -726px; }
+.light-gy_00017 { width: 72px; height: 70px; background-position: -308px -654px; }
+.light-gy_00018 { width: 76px; height: 74px; background-position: -174px -920px; }
+.light-gy_00019 { width: 80px; height: 78px; background-position: -92px -920px; }
+.light-gy_00020 { width: 84px; height: 82px; background-position: -90px -834px; }
+.light-gy_00021 { width: 88px; height: 86px; background-position: -2px -920px; }
+.light-gy_00022 { width: 92px; height: 90px; background-position: -378px -734px; }
+.light-gy_00023 { width: 96px; height: 94px; background-position: -210px -736px; }
+.light-gy_00024 { width: 100px; height: 98px; background-position: -108px -640px; }
+.light-gy_00025 { width: 104px; height: 102px; background-position: -2px -638px; }
+.light-gy_00026 { width: 108px; height: 106px; background-position: -112px -532px; }
+.light-gy_00027 { width: 112px; height: 110px; background-position: -388px -522px; }
+.light-gy_00028 { width: 116px; height: 114px; background-position: -392px -294px; }
+.light-gy_00029 { width: 120px; height: 118px; background-position: -266px -418px; }
+.light-gy_00030 { width: 124px; height: 122px; background-position: -266px -294px; }
+.light-gy_00031 { width: 128px; height: 126px; background-position: -136px -294px; }
+.light-gy_00032 { width: 132px; height: 130px; background-position: -2px -294px; }
+.light-gy_00033 { width: 136px; height: 134px; background-position: -2px -158px; }
+.light-gy_00034 { width: 140px; height: 138px; background-position: -160px -154px; }
+.light-gy_00035 { width: 144px; height: 142px; background-position: -314px -150px; }
+.light-gy_00036 { width: 148px; height: 146px; background-position: -314px -2px; }
+.light-gy_00037 { width: 152px; height: 150px; background-position: -160px -2px; }
+.light-gy_00038 { width: 156px; height: 154px; background-position: -2px -2px; }
+.light-gy_00039 { width: 86px; height: 84px; background-position: -2px -834px; }
+.light-gy_00040 { width: 88px; height: 86px; background-position: -204px -832px; }
+.light-gy_00041 { width: 92px; height: 90px; background-position: -2px -742px; }
+.light-gy_00042 { width: 94px; height: 92px; background-position: -108px -740px; }
+.light-gy_00043 { width: 96px; height: 94px; background-position: -210px -640px; }
+.light-gy_00044 { width: 100px; height: 98px; background-position: -382px -634px; }
+.light-gy_00045 { width: 102px; height: 100px; background-position: -222px -538px; }
+.light-gy_00046 { width: 104px; height: 102px; background-position: -2px -534px; }
+.light-gy_00047 { width: 108px; height: 106px; background-position: -2px -426px; }
+.light-gy_00048 { width: 110px; height: 108px; background-position: -136px -422px; }
+.light-gy_00049 { width: 112px; height: 110px; background-position: -392px -410px; }

BIN
2018专题/1807吸血鬼专题Wap-商务/src/img/atlas/light.png


BIN
2018专题/1807吸血鬼专题Wap-商务/src/img/icon/icon-mark-gray.png


+ 87 - 69
2018专题/1807吸血鬼专题Wap-商务/src/index.html

@@ -263,7 +263,6 @@
                             <div class="task-scene task-image image-27" v-show="task2.sceneIndex == 27" key="task2-scene27">
                                 <i class="icon-prev" @click="changeTask2Scene(26)"></i>
                                 <img data-src="./img/task/2/scene-27.jpg" alt="">
-                                <i class="icon-mark" @click="changeTask2Scene(24)"></i>
 
                                 <div class="mark-popup empty-popup">
                                     <header class="popup-hd">这里什么也没有</header>
@@ -306,6 +305,10 @@
                                 <img data-src="./img/task/2/scene-3.jpg" alt="">
                                 <i class="icon-next left" @click="changeTask2Scene(4)"></i>
                                 <i class="icon-next right" @click="changeTask2Scene(5)"></i>
+
+                                <div class="delete-line suanyatie top" v-show="task2.getSuanYaTie"></div>
+                                <div class="delete-line kuini middle" v-show="task2.getKuiNi"></div>
+                                <div class="delete-line nacl bottom" v-show="task2.getDrug"></div>
                             </div>
                             <!--左右分别选择(图片)e-->
 
@@ -315,6 +318,10 @@
                                 <img data-src="./img/task/2/scene-4.jpg" alt="">
                                 <i class="icon-next left" @click="changeTask2Scene(6)"></i>
                                 <i class="icon-next right" @click="changeTask2Scene(8)"></i>
+
+                                <div class="delete-line suanyatie top" v-show="task2.getSuanYaTie"></div>
+                                <div class="delete-line kuini middle" v-show="task2.getKuiNi"></div>
+                                <div class="delete-line nacl bottom" v-show="task2.getDrug"></div>
                             </div>
                             <!--左(图片)e-->
 
@@ -324,7 +331,13 @@
                                 <img data-src="./img/task/2/scene-5.jpg" alt="">
                                 <i class="icon-mark left" v-show="!task2.getKey" @click="changeTask2Scene(9)"></i>
                                 <i class="icon-next center" v-show="!task2.getKey" @click="changeTask2Scene(10)"></i>
-                                <i class="icon-mark right" @click="toBasement"></i>
+
+                                <i class="icon-mark right" v-show="task2.getKey" @click="toBasement"></i>
+                                <i class="icon-mark-gray right" v-show="!task2.getKey" @click="toBasement"></i>
+
+                                <div class="delete-line suanyatie top" v-show="task2.getSuanYaTie"></div>
+                                <div class="delete-line kuini middle" v-show="task2.getKuiNi"></div>
+                                <div class="delete-line nacl bottom" v-show="task2.getDrug"></div>
 
                                 <!--触发弹窗 s-->
                                 <div class="mark-popup fadeIn" v-show="task2.image4Popup">
@@ -343,6 +356,8 @@
                             <div class="task-scene task-image image-4" v-show="task2.sceneIndex == 37" key="task2-scene37">
                                 <img data-src="./img/task/2/scene-34.jpg" alt="">
                                 <i class="icon-mark right" @click="toBasement"></i>
+
+                                <div class="delete-line nacl top" v-show="task2.getDrug"></div>
                             </div>
                             <!--右 拿到钥匙后的(图片)e-->
 
@@ -350,7 +365,10 @@
                             <div class="task-scene task-image image-5" v-show="task2.sceneIndex == 6" key="task2-scene6">
                                 <i class="icon-prev" @click="changeTask2Scene(4)"></i>
                                 <img data-src="./img/task/2/scene-8.jpg" alt="">
-                                <i class="icon-mark" @click="changeTask2Scene(6)"></i>
+
+                                <div class="delete-line suanyatie top" v-show="task2.getSuanYaTie"></div>
+                                <div class="delete-line kuini middle" v-show="task2.getKuiNi"></div>
+                                <div class="delete-line nacl bottom" v-show="task2.getDrug"></div>
 
                                 <div class="mark-popup empty-popup">
                                     <section class="popup-bd">
@@ -367,6 +385,10 @@
                                 <img data-src="./img/task/2/scene-6.jpg" alt="">
                                 <i class="icon-next center" @click="changeTask2Scene(8)"></i>
                                 <i class="icon-next right" @click="changeTask2Scene(5)"></i>
+
+                                <div class="delete-line suanyatie top" v-show="task2.getSuanYaTie"></div>
+                                <div class="delete-line kuini middle" v-show="task2.getKuiNi"></div>
+                                <div class="delete-line nacl bottom" v-show="task2.getDrug"></div>
                             </div>
                             <!--中间(图片)e-->
 
@@ -374,7 +396,11 @@
                             <div class="task-scene task-image image-7" v-show="task2.sceneIndex == 8" key="task2-scene8">
                                 <i class="icon-prev" @click="changeTask2Scene(4)"></i>
                                 <img data-src="./img/task/2/scene-7.jpg" alt="">
-                                <i class="icon-mark" @click="fadeIn('task2','image7Popup')"></i>
+                                <i class="icon-mark" @click="toGetGoods('getBottle1',7)"></i>
+
+                                <div class="delete-line suanyatie top" v-show="task2.getSuanYaTie"></div>
+                                <div class="delete-line kuini middle" v-show="task2.getKuiNi"></div>
+                                <div class="delete-line nacl bottom" v-show="task2.getDrug"></div>
 
                                 <!--触发图片 s-->
                                 <div class="image-popup fadeIn" v-show="task2.image7Popup">
@@ -388,11 +414,15 @@
                             <div class="task-scene task-image image-8" v-show="task2.sceneIndex == 9" key="task2-scene9">
                                 <i class="icon-prev" @click="changeTask2Scene(5)"></i>
                                 <img data-src="./img/task/2/scene-9.jpg" alt="">
-                                <i class="icon-mark" @click="fadeIn('task2','image8Popup')"></i>
+                                <i class="icon-mark" @click="toGetGoods('getXianLing',8)"></i>
+
+                                <div class="delete-line suanyatie top" v-show="task2.getSuanYaTie"></div>
+                                <div class="delete-line kuini middle" v-show="task2.getKuiNi"></div>
+                                <div class="delete-line nacl bottom" v-show="task2.getDrug"></div>
 
                                 <!--触发图片 s-->
                                 <div class="image-popup fadeIn" v-show="task2.image8Popup">
-                                    <img src="./img/task/taipingjian-left-room.jpg" alt="">
+                                    <img data-src="./img/task/taipingjian-left-room.jpg" alt="">
                                 </div>
                                 <!--触发图片 e-->
                             </div>
@@ -402,10 +432,15 @@
                             <div class="task-scene task-image image-9" v-show="task2.sceneIndex == 10" key="task2-scene10">
                                 <i class="icon-prev" @click="changeTask2Scene(5)"></i>
                                 <img data-src="./img/task/2/scene-10.jpg" alt="">
-                                <i class="icon-mark left" @click="toBlamingVideo"></i>
+                                <i class="icon-light-mark left" @click="toBlamingVideo">
+                                    <i class="ani-light"></i>
+                                    <i class="icon-mark-static"></i>
+                                </i>
                                 <i class="icon-mark right" @click="changeTask2Scene(11)"></i>
 
-                                <div class="delete-line" v-show="task2.getSuanYaTie"></div>
+                                <div class="delete-line suanyatie top" v-show="task2.getSuanYaTie"></div>
+                                <div class="delete-line kuini middle" v-show="task2.getKuiNi"></div>
+                                <div class="delete-line nacl bottom" v-show="task2.getDrug"></div>
 
                                 <div class="mark-popup empty-popup" v-if="task2.image9Popup">
                                     <section class="popup-bd">
@@ -429,24 +464,17 @@
                             <div class="task-scene task-image image-10" v-show="task2.sceneIndex == 11" key="task2-scene11">
                                 <i class="icon-prev" @click="changeTask2Scene(10)"></i>
                                 <img data-src="./img/task/2/scene-11.jpg" alt="">
-                                <i class="icon-mark" @click="toGetSuanYaTie"></i>
+                                <i class="icon-mark" @click="toGetGoods('getSuanYaTie',10)"></i>
 
-                                <div class="delete-line" v-show="task2.getSuanYaTie"></div>
+                                <div class="delete-line suanyatie top" v-show="task2.getSuanYaTie"></div>
+                                <div class="delete-line kuini middle" v-show="task2.getKuiNi"></div>
+                                <div class="delete-line nacl bottom" v-show="task2.getDrug"></div>
 
                                 <!--触发图片 s-->
                                 <div class="image-popup fadeIn" v-show="task2.image10Popup">
                                     <img data-src="./img/task/before-kill-first-boss.jpg" alt="">
                                 </div>
                                 <!--触发图片 e-->
-
-                                <div class="mark-popup empty-popup" v-show="task2.image10GetPopup">
-                                    <section class="popup-bd">
-                                        <p class="popup-desc">
-                                            请勿重复搜寻
-                                            <br>你已经搜寻过一次了,去其他地方看看吧
-                                        </p>
-                                    </section>
-                                </div>
                             </div>
                             <!--楼上右边房间(图片)e-->
 
@@ -456,8 +484,10 @@
                                 <img data-src="./img/task/2/scene-12.jpg" alt="">
                                 <i class="icon-next" @click="toTask2Scene13"></i>
 
-                                <i class="icon-mark" @click="toGetKuiNi"></i>
-                                <div class="delete-line" v-show="task2.getKuiNi"></div>
+                                <i class="icon-mark" @click="toGetGoods('getKuiNi',11)"></i>
+                                <div class="delete-line key top" v-show="task2.getKey"></div>
+                                <div class="delete-line kuini middle" v-show="task2.getKuiNi"></div>
+                                <div class="delete-line nacl bottom" v-show="task2.getDrug"></div>
 
                                 <div class="mark-popup empty-popup" v-show="task2.image11EmptyPopup">
                                     <section class="popup-bd">
@@ -473,15 +503,6 @@
                                     <img data-src="./img/task/kill-first-boss-2.jpg" alt="">
                                 </div>
                                 <!--触发图片 e-->
-
-                                <div class="mark-popup empty-popup" v-if="task2.image11GetPopup">
-                                    <section class="popup-bd">
-                                        <p class="popup-desc">
-                                            请勿重复搜寻
-                                            <br>你已经搜寻过一次了,去其他地方看看吧
-                                        </p>
-                                    </section>
-                                </div>
                             </div>
                             <!--楼上中间房间(图片)e-->
 
@@ -492,8 +513,9 @@
                                 <i class="icon-next center" @click="changeTask2Scene(14)"></i>
                                 <i class="icon-next right" @click="changeTask2Scene(15)"></i>
 
-                                <div class="delete-line key" v-show="task2.getKey"></div>
-                                <div class="delete-line suanyatie" v-show="task2.getSuanYaTie"></div>
+                                <div class="delete-line suanyatie top" v-show="task2.getKey"></div>
+                                <div class="delete-line nacl middle" v-show="task2.getDrug"></div>
+                                <div class="delete-line key  bottom" v-show="task2.getSuanYaTie"></div>
                             </div>
                             <!--打死第一只劣魔后左侧房间展示(图片)e-->
 
@@ -503,22 +525,14 @@
                                 <img data-src="./img/task/2/scene-14.jpg" alt="">
                                 <i class="icon-mark" @click="toGetKey"></i>
 
-                                <div class="delete-line" v-show="task2.getKey"></div>
+                                <div class="delete-line key top" v-show="task2.getKey"></div>
+                                <div class="delete-line nacl middle" v-show="task2.getDrug"></div>
 
                                 <!--触发图片 s-->
                                 <div class="image-popup fadeIn" v-show="task2.image13Popup">
                                     <img data-src="./img/task/tingshifang-key.jpg" alt="">
                                 </div>
                                 <!--触发图片 e-->
-
-                                <div class="mark-popup empty-popup" v-show="task2.image13GetPopup">
-                                    <section class="popup-bd">
-                                        <p class="popup-desc">
-                                            请勿重复搜寻
-                                            <br>你已经搜寻过一次了,去其他地方看看吧
-                                        </p>
-                                    </section>
-                                </div>
                             </div>
                             <!--楼上左侧房间领到地下室钥匙(图片)e-->
 
@@ -526,7 +540,8 @@
                             <div class="task-scene task-image image-14" v-show="task2.sceneIndex == 15" key="task2-scene15">
                                 <i class="icon-prev" @click="changeTask2Scene(13)"></i>
                                 <img data-src="./img/task/2/scene-15.jpg" alt="">
-                                <i class="icon-mark" @click="changeTask2Scene(6)"></i>
+
+                                <div class="delete-line nacl top" v-show="task2.getDrug"></div>
                             </div>
                             <!--楼上直走(图片)e-->
 
@@ -535,6 +550,8 @@
                                 <i class="icon-prev" @click="changeTask2Scene(13)"></i>
                                 <img data-src="./img/task/2/scene-16.jpg" alt="">
                                 <i class="icon-next" @click="changeTask2Scene(37)"></i>
+
+                                <div class="delete-line nacl top" v-show="task2.getDrug"></div>
                             </div>
                             <!--下楼(图片)e-->
 
@@ -542,7 +559,12 @@
                             <div class="task-scene task-image image-16" v-show="task2.sceneIndex == 17" key="task2-scene17">
                                 <i class="icon-prev" @click="changeTask2Scene(5)"></i>
                                 <img data-src="./img/task/2/scene-17.jpg" alt="">
-                                <i class="icon-mark" @click="toBasementVideo"></i>
+                                <i class="icon-light-mark" @click="toBasementVideo">
+                                    <i class="ani-light"></i>
+                                    <i class="icon-mark-static"></i>
+                                </i>
+
+                                <div class="delete-line nacl top" v-show="task2.getDrug"></div>
                             </div>
                             <!--地下室展示(图片)e-->
 
@@ -584,6 +606,8 @@
                                 <i class="icon-prev" @click="changeTask2Scene(18)"></i>
                                 <img data-src="./img/task/2/scene-21.jpg" alt="">
                                 <i class="icon-next" @click="changeTask2Scene(22)"></i>
+
+                                <div class="delete-line nacl top" v-show="task2.getDrug"></div>
                             </div>
                             <!--打死第一只劣魔后的直走(图片)e-->
 
@@ -591,7 +615,12 @@
                             <div class="task-scene task-image image-21" v-show="task2.sceneIndex == 22" key="task2-scene22">
                                 <i class="icon-prev" @click="changeTask2Scene(21)"></i>
                                 <img data-src="./img/task/2/scene-22.jpg" alt="">
-                                <i class="icon-mark" @click="toBossVideo"></i>
+                                <i class="icon-light-mark" @click="toBossVideo">
+                                    <i class="ani-light"></i>
+                                    <i class="icon-mark-static"></i>
+                                </i>
+
+                                <div class="delete-line nacl top" v-show="task2.getDrug"></div>
                             </div>
                             <!--打死第二只劣魔后进入房间展示(图片)e-->
 
@@ -609,22 +638,13 @@
                                 <i class="icon-mark" @click="toGetDrug"></i>
                                 <i class="icon-next" v-show="task2.getDrug" @click="changeTask2Scene(34)" v-show="task2.getDrug"></i>
 
-                                <div class="delete-line" v-show="task2.getDrug"></div>
+                                <div class="delete-line nacl top" v-show="task2.getDrug"></div>
 
                                 <!--触发图片 s-->
                                 <div class="image-popup fadeIn" v-show="task2.image33Popup">
                                     <img data-src="./img/task/last-drug.jpg" alt="">
                                 </div>
                                 <!--触发图片 e-->
-
-                                <div class="mark-popup empty-popup" v-show="task2.image33GetPopup">
-                                    <section class="popup-bd">
-                                        <p class="popup-desc">
-                                            请勿重复搜寻
-                                            <br>你已经搜寻过一次了,去其他地方看看吧
-                                        </p>
-                                    </section>
-                                </div>
                             </div>
                             <!--打完Boss以后(图片)e-->
 
@@ -638,7 +658,7 @@
 
                             <!--从桌子前上到阁台 s-->
                             <div class="task-scene" v-show="task2.sceneIndex == 35" key="task2-scene35">
-                                <video preload="none" ref="task2-4" @pause="videoPause" @ended="task2FlyVideoEnd" x-webkit-airplay=""
+                                <video preload="none" ref="task2-4" @pause="videoPause" @timeupdate="task2FlyVideoUpate" @ended="task2FlyVideoEnd" x-webkit-airplay=""
                                 webkit-playsinline="" playsinline="" x5-video-player-type="h5" x5-video-player-fullscreen="true"
                                 x5-video-orientation="portrait"></video>
                             </div>
@@ -656,24 +676,24 @@
                                     <section class="popup-bd">
                                         <img data-src="./img/task/2/create-drug-succ.jpg" alt="">
                                         <p class="popup-desc">
-                                            你已完成任务2,前往完成其他任务吧!
+                                            恭喜你已经获得了疲劳症的疗法
                                         </p>
                                     </section>
                                 </div>
                                 <!--触发左边 e-->
                             </div>
                             <!--阁台之上的样子(图片)e-->
-                        </div>
-                    </transition>
 
-                    <!--按住W前进 s-->
-                    <div class="task-tips" v-show="task2.sceneIndex == 32  && task2.focusKeydownW">
-                        <div class="task-tips-context">
-                            <a class="task-tips-btn">双击
-                                <i class="icon-w"></i>突进</a>
+                            <div :class="['mark-popup','empty-popup','repeat-popup'+task2.markPopupIndex]" v-show="task2.markPopupVisible==1">
+                                <section class="popup-bd">
+                                    <p class="popup-desc">
+                                        请勿重复搜寻
+                                        <br>你已经搜寻过一次了,去其他地方看看吧
+                                    </p>
+                                </section>
+                            </div>
                         </div>
-                    </div>
-                    <!--按住W前进 e-->
+                    </transition>
                 </div>
                 <!--第二个任务 e-->
 
@@ -681,7 +701,7 @@
                 <!--结束页 s-->
                 <div class="page-end-prev" v-if="swiperIndex == 5" key="end2">
                     <a class="link-home">更多详情请到官网去看&gt;&gt;</a>
-                    <a href="" title="结束页" class="btn-end"></a>
+                    <button title="结束页"  @click="slideTo(6)" class="btn-end"></button>
                 </div>
                 <!--结束页 e-->
 
@@ -693,7 +713,6 @@
                     <a href="" title="往期回顾" class="btn-history"></a>
                 </div>
                 <!--结束页 e-->
-
             </transition>
 
             <div class="main-navbar fadeIn" v-if="showNavBar">
@@ -720,7 +739,6 @@
                     <i class="close" title="关闭" @click="commentVisible = 0">×</i>
                     <iframe src="//ceshi.duowan.com/1807/m_396961016619.html" frameborder="0"></iframe>
                 </div>
-
             </div>
         </div>
     </div>

+ 3 - 8
2018专题/1807吸血鬼专题Wap-商务/src/js/index.js

@@ -87,9 +87,9 @@ let app = new Vue({
         },
         async  loaderVideoSource() {
             let videoRef2 = ['task1-0', 'task1-1'],
-                vids2 = ['8923685', '8923687'],
+                vids2 = ['8923685', '8934093'],
                 videoRef3 = ['task2-0', 'task2-1', 'task2-2', 'task2-3', 'task2-4'],
-                vids3 = ['8933855', '8926327', '8926783', '8926719', '8926875']
+                vids3 = ['8933855', '8926327', '8926783', '8934123', '8926875']
 
             await this.getVideoSource(videoRef2, vids2)
             await this.getVideoSource(videoRef3, vids3)
@@ -182,21 +182,16 @@ let app = new Vue({
             }
         },
         stopBgm() {
-            console.log("daslkjd")
             let { stopSound } = this
             if (stopSound) {
-                console.log("播放")
                 mediaCtrl.play(this.sound)
             } else {
-                console.log("暂停")
                 mediaCtrl.pause(this.sound)
             }
             this.stopSound = stopSound == 1 ? 0 : 1
-            console.log(this.stopSound)
         },
         lazyload() {
             let lazyEles = this.$el.querySelectorAll('img[data-src]')
-            console.log(lazyEles)
             if (lazyEles && lazyEles.length) {
                 lazyEles = Array.from(lazyEles)
                 lazyEles.forEach(ele => {
@@ -215,7 +210,6 @@ let app = new Vue({
         },
         fixedPlay(){
             this.playVisible = false
-
             this.$refs[this.skipTarget].play()
         },
         fixedSkip() {
@@ -277,6 +271,7 @@ let app = new Vue({
         taskFinish(index) {
             Vue.set(this.progress, index, 1)
             this.progressCount++
+            this.playVisible = false
             if (this.progressCount >= this.allProgress) {
                 console.log('完成所有任务')
             }

+ 90 - 32
2018专题/1807吸血鬼专题Wap-商务/src/js/task2.js

@@ -36,21 +36,36 @@ const Task2 = {
     getKuiNi: false,
     getKey: false,
     getDrug: false,
+    getXianLing: false,
+    getBottle1 : false,
+
+    videoEndStatus : [0,0,0,0,0], //视频是否结束
+
+    markPopupVisible: 0, //物品寻找重复提示
+    markPopupIndex: 0, //物品寻找重复提示-物品索引
 }
 
 const Task2Vue = {
     methods: {
         toScene1() {
-            this.changeTask2Scene(1, () => {
+            if(this.task2.videoEndStatus[0]==1) {
+                this.task2FirstVideoEnd();
+            } else {
+                this.changeTask2Scene(1, () => {
                 // mediaCtrl.play(this.$refs['task2-0'])
-            })
-            this.$refs['task2-0'].play()
+                })
+                this.$refs['task2-0'].play()
+            }
         },
-        task2FirstVideoEnd() {
+        //flag-1点击跳过
+        task2FirstVideoEnd(flag) {
             this.playVisible = false
             this.resetSkip()
             mediaCtrl.pause(this.$refs['task2-0'])
             this.changeTask2Scene(23)
+            if(!flag) {
+                Vue.set(this.task2.videoEndStatus, 0, 1)
+            }
         },
         task2FirstVideoUpate() {
             if (this.skipLock) return
@@ -61,29 +76,50 @@ const Task2Vue = {
         },
         toBlamingVideo() {
             if (this.task2.getSuanYaTie) {
-                this.changeTask2Scene(30, () => {
-                    // mediaCtrl.play(this.$refs['task2-1'])
-                })
-                this.$refs['task2-1'].play()
+                if (this.task2.videoEndStatus[1]==1) {
+                    this.task2BlamingVideoEnd()
+                } else {
+                    this.changeTask2Scene(30, () => {
+                        // mediaCtrl.play(this.$refs['task2-1'])
+                    })
+                    this.$refs['task2-1'].play()
+                }
             } else {
                 this.fadeIn('task2', 'image9Popup')
             }
         },
-        toGetSuanYaTie() {
-            if (this.task2.getSuanYaTie) {
-                this.fadeIn('task2', 'image10GetPopup')
-            } else {
-                this.fadeIn('task2', 'image10Popup')
-                this.task2.getSuanYaTie = true
-            }
+        toPopupRepeatMask(index){
+            this.task2.markPopupIndex = index
+            this.task2.markPopupVisible = true
+            this.fadeIn('task2', 'markPopupVisible')
 
+            // switch(index){
+            //     case 7 :
+            //         this.task2.image7Popup = 0
+            //         break;
+            //     case 8 :
+            //         this.task2.image8Popup = 0
+            //         break;
+            //     case 10 :
+            //         this.task2.image10Popup = 0
+            //         break;
+            //     case 11 :
+            //         this.task2.image11Popup = 0
+            //         break;
+            //     case 13 :
+            //         this.task2.image13Popup = 0
+            //         break;
+            //     case 33 :
+            //         this.task2.image33Popup = 0
+            //         break;
+            // }
         },
-        toGetKuiNi() {
-            if (this.task2.getKuiNi) {
-                this.fadeIn('task2', 'image11GetPopup')
+        toGetGoods(attr,attrIndex){
+            if (this.task2[attr]) {
+                this.toPopupRepeatMask(attrIndex)
             } else {
-                this.task2.getKuiNi = true
-                this.fadeIn('task2', 'image11Popup')
+                this.task2[attr] = true
+                this.fadeIn('task2',`image${attrIndex}Popup`)
             }
         },
         toTask2Scene13() {
@@ -93,11 +129,13 @@ const Task2Vue = {
                 this.fadeIn('task2', 'image11EmptyPopup')
             }
         },
-        task2BlamingVideoEnd() {
+        //flag-1点击跳过
+        task2BlamingVideoEnd(e) {
             this.playVisible = false
             this.resetSkip()
             mediaCtrl.pause(this.$refs['task2-1'])
             this.changeTask2Scene(12)
+            if(e && e.type == "ended") Vue.set(this.task2.videoEndStatus, 1, 1)
         },
         task2BlamingVideoUpdate() {
             if (this.skipLock) return
@@ -107,16 +145,22 @@ const Task2Vue = {
             }
         },
         toBasementVideo() {
-            this.changeTask2Scene(31, () => {
+            if (this.task2.videoEndStatus[2]==1) {
+                this.task2BasementVideoEnd()
+            } else {
+                this.changeTask2Scene(31, () => {
                 // mediaCtrl.play(this.$refs['task2-2'])
-            })
-            this.$refs['task2-2'].play()
+                })
+                this.$refs['task2-2'].play()
+            }
         },
-        task2BasementVideoEnd() {
+        //flag-1点击跳过
+        task2BasementVideoEnd(e) {
             this.playVisible = false
             this.resetSkip()
             mediaCtrl.pause(this.$refs['task2-2'])
             this.changeTask2Scene(18)
+            if(e && e.type == "ended")  Vue.set(this.task2.videoEndStatus, 2, 1)
         },
         task2BasementVideoUpdate() {
             if (this.skipLock) return
@@ -128,6 +172,7 @@ const Task2Vue = {
         changeTask2Scene(index, cb) {
             this.task2.nextSceneIndex = index
             this.task2.sceneChange = true
+            this.task2.markPopupVisible = false
 
             this.task2.sceneEnterCb = cb || function () { }
         },
@@ -156,7 +201,7 @@ const Task2Vue = {
 
         toGetKey() {
             if (this.task2.getKey) {
-                this.fadeIn('task2', 'image13GetPopup')
+                this.toPopupRepeatMask(13)
             } else {
                 this.task2.getKey = true
                 this.fadeIn('task2', 'image13Popup')
@@ -164,16 +209,22 @@ const Task2Vue = {
         },
 
         toBossVideo() {
-            this.changeTask2Scene(32, () => {
-                // mediaCtrl.play(this.$refs['task2-3'])
-            })
-            this.$refs['task2-3'].play();
+            if (this.task2.videoEndStatus[3]==1) {
+                this.task2BossVideoEnd()
+            } else {
+                this.changeTask2Scene(32, () => {
+                    // mediaCtrl.play(this.$refs['task2-3'])
+                })
+                this.$refs['task2-3'].play();
+            }
         },
-        task2BossVideoEnd() {
+        //flag-1点击跳过
+        task2BossVideoEnd(e) {
             this.playVisible = false
             this.resetSkip()
             mediaCtrl.pause(this.$refs['task2-3'])
             this.changeTask2Scene(33)
+            if(e && e.type == "ended") Vue.set(this.task2.videoEndStatus, 3, 1)
         },
         task2BossVideoUpdate() {
             if (this.skipLock) return
@@ -184,7 +235,7 @@ const Task2Vue = {
         },
         toGetDrug() {
             if (this.task2.getDrug) {
-                this.fadeIn('task2', 'image33GetPopup')
+                this.toPopupRepeatMask(33)
             } else {
                 this.task2.getDrug = true
                 this.fadeIn('task2', 'image33Popup')
@@ -197,6 +248,13 @@ const Task2Vue = {
             })
             this.$refs['task2-4'].play();
         },
+        task2FlyVideoUpate(){
+            if (this.skipLock) return
+            if (this.$refs['task2-4'].currentTime >= 1) {
+                // this.skipVisible = true
+                this.skipTarget = 'task2-4'
+            }
+        },
         task2FlyVideoEnd() {
             this.playVisible = false
             this.resetSkip()

+ 47 - 0
2018专题/1807吸血鬼专题Wap-商务/src/sass/global.scss

@@ -133,6 +133,7 @@ music;
     position: absolute;
     left: 0;
     top: 0;
+    z-index: 99;
     width: px2rem(512);
     padding: px2rem(42) px2rem(44);
     background-color: rgba($color: #000000, $alpha: 0.34);
@@ -180,6 +181,52 @@ music;
     background-color: #782828;
 }
 
+
+.icon-light-mark {
+    position: relative;
+    .ani-light {
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+        background: url("../img/atlas/light.png") no-repeat;
+        animation: light 2s steps(1) infinite;
+    }
+    .icon-mark-static {
+        position: relative;
+        width: px2rem(44.8);
+        height: px2rem(60);
+        z-index: 1;
+    }
+}
+
+.icon-mark {
+    position: relative;
+    width: 56px;
+    height: 74px;
+    cursor: pointer;
+    transform: scale(0.4) translate(-50px, -63px);
+    &:before {
+        content: '';
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+        background: url("../img/atlas/icon-1.png") no-repeat;
+        animation: icon1 3s steps(37) infinite;
+        // background: url("../img/atlas/icon.png") no-repeat;
+        // animation: icon 3s steps(1) infinite;
+    }
+}
+
+.icon-mark-static {
+    display: block;
+    width: px2rem(56);
+    height: px2rem(74);
+    cursor: pointer;
+    background: url("../img/icon/icon-mark.png") no-repeat center / 100% 100%;
+}
+
 @import 'module/swiper';
 
 @import 'page/primary';

+ 465 - 0
2018专题/1807吸血鬼专题Wap-商务/src/sass/module/_animation.scss

@@ -137,4 +137,469 @@
     50% {
         transform: translate3d(0, 8px, 0) rotate(90deg);
     }
+}
+
+@keyframes shake {
+    from,
+    to {
+        transform: translate3d(0, 0, 0);
+    }
+    10% {
+        transform: translate3d(0, 2px, 0);
+    }
+    30% {
+        transform: translate3d(0, 4px, 0);
+    }
+}
+
+@keyframes light {
+    from,2% {
+        width: 4px;
+        height: 4px;
+        background-position: -504px -94px;
+    }
+    4% {
+        width: 10px;
+        height: 8px;
+        background-position: -500px -134px;
+    }
+    6% {
+        width: 14px;
+        height: 14px;
+        background-position: -140px -178px;
+    }
+    8% {
+        width: 18px;
+        height: 18px;
+        background-position: -140px -158px;
+    }
+    10% {
+        width: 22px;
+        height: 22px;
+        background-position: -488px -254px;
+    }
+    12% {
+        width: 26px;
+        height: 26px;
+        background-position: -460px -254px;
+    }
+    14% {
+        width: 30px;
+        height: 30px;
+        background-position: -460px -222px;
+    }
+    16% {
+        width: 34px;
+        height: 34px;
+        background-position: -464px -134px;
+    }
+    18% {
+        width: 38px;
+        height: 38px;
+        background-position: -464px -94px;
+    }
+    20% {
+        width: 42px;
+        height: 42px;
+        background-position: -464px -50px;
+    }
+    22% {
+        width: 46px;
+        height: 46px;
+        background-position: -464px -2px;
+    }
+    24% {
+        width: 50px;
+        height: 50px;
+        background-position: -460px -170px;
+    }
+    26% {
+        width: 54px;
+        height: 54px;
+        background-position: -326px -598px;
+    }
+    28% {
+        width: 60px;
+        height: 58px;
+        background-position: -326px -538px;
+    }
+    30% {
+        width: 64px;
+        height: 62px;
+        background-position: -308px -794px;
+    }
+    32% {
+        width: 68px;
+        height: 66px;
+        background-position: -308px -726px;
+    }
+    34% {
+        width: 72px;
+        height: 70px;
+        background-position: -308px -654px;
+    }
+    36% {
+        width: 76px;
+        height: 74px;
+        background-position: -174px -920px;
+    }
+    38% {
+        width: 80px;
+        height: 78px;
+        background-position: -92px -920px;
+    }
+    40% {
+        width: 84px;
+        height: 82px;
+        background-position: -90px -834px;
+    }
+    42% {
+        width: 88px;
+        height: 86px;
+        background-position: -2px -920px;
+    }
+    44% {
+        width: 92px;
+        height: 90px;
+        background-position: -378px -734px;
+    }
+    46% {
+        width: 96px;
+        height: 94px;
+        background-position: -210px -736px;
+    }
+    48% {
+        width: 100px;
+        height: 98px;
+        background-position: -108px -640px;
+    }
+    50% {
+        width: 104px;
+        height: 102px;
+        background-position: -2px -638px;
+    }
+    52% {
+        width: 108px;
+        height: 106px;
+        background-position: -112px -532px;
+    }
+    54% {
+        width: 112px;
+        height: 110px;
+        background-position: -388px -522px;
+    }
+    56% {
+        width: 116px;
+        height: 114px;
+        background-position: -392px -294px;
+    }
+    58% {
+        width: 120px;
+        height: 118px;
+        background-position: -266px -418px;
+    }
+    60% {
+        width: 124px;
+        height: 122px;
+        background-position: -266px -294px;
+    }
+    62% {
+        width: 128px;
+        height: 126px;
+        background-position: -136px -294px;
+    }
+    64% {
+        width: 132px;
+        height: 130px;
+        background-position: -2px -294px;
+    }
+    66% {
+        width: 136px;
+        height: 134px;
+        background-position: -2px -158px;
+    }
+    68% {
+        width: 140px;
+        height: 138px;
+        background-position: -160px -154px;
+    }
+    70% {
+        width: 144px;
+        height: 142px;
+        background-position: -314px -150px;
+    }
+    72% {
+        width: 148px;
+        height: 146px;
+        background-position: -314px -2px;
+    }
+    74% {
+        width: 152px;
+        height: 150px;
+        background-position: -160px -2px;
+    }
+    76% {
+        width: 156px;
+        height: 154px;
+        background-position: -2px -2px;
+    }
+    78% {
+        width: 86px;
+        height: 84px;
+        background-position: -2px -834px;
+    }
+    80% {
+        width: 88px;
+        height: 86px;
+        background-position: -204px -832px;
+    }
+    82% {
+        width: 92px;
+        height: 90px;
+        background-position: -2px -742px;
+    }
+    84% {
+        width: 94px;
+        height: 92px;
+        background-position: -108px -740px;
+    }
+    86% {
+        width: 96px;
+        height: 94px;
+        background-position: -210px -640px;
+    }
+    88% {
+        width: 100px;
+        height: 98px;
+        background-position: -382px -634px;
+    }
+    90% {
+        width: 102px;
+        height: 100px;
+        background-position: -222px -538px;
+    }
+    92% {
+        width: 104px;
+        height: 102px;
+        background-position: -2px -534px;
+    }
+    94% {
+        width: 108px;
+        height: 106px;
+        background-position: -2px -426px;
+    }
+    96% {
+        width: 110px;
+        height: 108px;
+        background-position: -136px -422px;
+    }
+    to,98% {
+        width: 112px;
+        height: 110px;
+        background-position: -392px -410px;
+    }
+}
+
+@keyframes icon1 {
+from {
+    background-position: 0 0;
+}
+to {
+    background-position: 0 bottom;
+}
+}
+
+@keyframes icon {
+    from,
+    2.63% {
+        width: 52px;
+        height: 72px;
+        background-position: -458px -316px;
+    }
+    5.26% {
+        width: 52px;
+        height: 72px;
+        background-position: -404px -316px;
+    }
+    7.89% {
+        width: 52px;
+        height: 72px;
+        background-position: -350px -414px;
+    }
+    10.52% {
+        width: 54px;
+        height: 74px;
+        background-position: -412px -240px;
+    }
+    13.15% {
+        width: 54px;
+        height: 74px;
+        background-position: -296px -264px;
+    }
+    15.78% {
+        width: 56px;
+        height: 76px;
+        background-position: -418px -162px;
+    }
+    18.41% {
+        width: 58px;
+        height: 76px;
+        background-position: -296px -80px;
+    }
+    21.04% {
+        width: 60px;
+        height: 80px;
+        background-position: -418px -2px;
+    }
+    23.67% {
+        width: 62px;
+        height: 82px;
+        background-position: -292px -180px;
+    }
+    26.30% {
+        width: 64px;
+        height: 84px;
+        background-position: -230px -2px;
+    }
+    28.93% {
+        width: 66px;
+        height: 84px;
+        background-position: -228px -94px;
+    }
+    31.56% {
+        width: 68px;
+        height: 86px;
+        background-position: -226px -278px;
+    }
+    34.19% {
+        width: 70px;
+        height: 90px;
+        background-position: -158px -2px;
+    }
+    36.82% {
+        width: 72px;
+        height: 92px;
+        background-position: -154px -382px;
+    }
+    39.45% {
+        width: 74px;
+        height: 92px;
+        background-position: -80px -288px;
+    }
+    42.08% {
+        width: 74px;
+        height: 92px;
+        background-position: -80px -194px;
+    }
+    44.71% {
+        width: 76px;
+        height: 94px;
+        background-position: -2px -388px;
+    }
+    47.34% {
+        width: 76px;
+        height: 94px;
+        background-position: -2px -292px;
+    }
+    49.97% {
+        width: 78px;
+        height: 96px;
+        background-position: -2px -2px;
+    }
+    52.60% {
+        width: 76px;
+        height: 94px;
+        background-position: -2px -196px;
+    }
+    55.23% {
+        width: 76px;
+        height: 94px;
+        background-position: -2px -100px;
+    }
+    57.86% {
+        width: 74px;
+        height: 92px;
+        background-position: -82px -2px;
+    }
+    60.49% {
+        width: 74px;
+        height: 92px;
+        background-position: -80px -100px;
+    }
+    63.12% {
+        width: 72px;
+        height: 92px;
+        background-position: -80px -382px;
+    }
+    65.75% {
+        width: 70px;
+        height: 90px;
+        background-position: -156px -96px;
+    }
+    68.38% {
+        width: 70px;
+        height: 88px;
+        background-position: -156px -188px;
+    }
+    71.01% {
+        width: 68px;
+        height: 86px;
+        background-position: -156px -278px;
+    }
+    73.64% {
+        width: 66px;
+        height: 84px;
+        background-position: -228px -366px;
+    }
+    76.27% {
+        width: 62px;
+        height: 82px;
+        background-position: -228px -180px;
+    }
+    78.90% {
+        width: 60px;
+        height: 80px;
+        background-position: -356px -2px;
+    }
+    81.53% {
+        width: 60px;
+        height: 78px;
+        background-position: -356px -84px;
+    }
+    84.16% {
+        width: 58px;
+        height: 76px;
+        background-position: -296px -2px;
+    }
+    86.79% {
+        width: 56px;
+        height: 76px;
+        background-position: -418px -84px;
+    }
+    89.42% {
+        width: 54px;
+        height: 74px;
+        background-position: -356px -240px;
+    }
+    92.05% {
+        width: 54px;
+        height: 74px;
+        background-position: -356px -164px;
+    }
+    94.68% {
+        width: 52px;
+        height: 72px;
+        background-position: -350px -340px;
+    }
+    97.31% {
+        width: 52px;
+        height: 72px;
+        background-position: -296px -414px;
+    }
+    99.94%,
+    to {
+        width: 52px;
+        height: 72px;
+        background-position: -296px -340px;
+    }
 }

+ 7 - 0
2018专题/1807吸血鬼专题Wap-商务/src/sass/module/_icon.scss

@@ -19,6 +19,13 @@ f;
         }
     }
 }
+.icon-mark-gray {
+    display: block;
+    width: 22px;
+    height: 29px;
+    cursor: pointer;
+    background: url("../img/icon/icon-mark-gray.png") no-repeat center / 100% 100%;
+}
 
 .icon-mark {
     display: block;

+ 59 - 15
2018专题/1807吸血鬼专题Wap-商务/src/sass/page/_task-2.scss

@@ -119,11 +119,7 @@
         }
     }
     .image-5 {
-        .empty-popup {
-            left: px2rem(650);
-            top: px2rem(200);
-            text-align: center;
-        }
+        
     }
     .image-6 {
         .center {
@@ -172,10 +168,6 @@
             left: px2rem(1450);
             top: px2rem(415);
         }
-        .empty-popup {
-            left: px2rem(900);
-            top: px2rem(200);
-        }
         .delete-line {
             left: px2rem(1536);
             top: px2rem(356);
@@ -218,10 +210,6 @@
                 margin-bottom: px2rem(10);
             }
         }
-        .empty-popup {
-            left: px2rem(840);
-            top: px2rem(380);
-        }
         .delete-line {
             left: px2rem(1536);
             top: px2rem(378);
@@ -289,7 +277,7 @@
         }
     }
     .image-16 {
-        .icon-mark {
+        .icon-light-mark {
             position: absolute;
             left: px2rem(426);
             top: px2rem(336);
@@ -325,7 +313,7 @@
         }
     }
     .image-21 {
-        .icon-mark {
+        .icon-light-mark {
             position: absolute;
             left: px2rem(840);
             top: px2rem(423);
@@ -444,4 +432,60 @@
         bottom: px2rem(40);
         width: px2rem(148);
     }
+    .suanyatie {
+        width: px2rem(146);
+    }
+    .kuini {
+        width: px2rem(100);
+    }
+    .nacl {
+        width: px2rem(132);
+    }
+    .key {
+        width: px2rem(210);
+    }
+    .delete-line {
+        left: px2rem(1536);
+        &.top {
+            top: px2rem(356);
+        }
+        &.center {
+            top: px2rem(378);
+        }
+        &.bottom {
+            top: px2rem(400);
+        }
+    }
+    .repeat-popup5 {
+        left: px2rem(650);
+        top: px2rem(200);
+        text-align: center;
+    }
+    .repeat-popup7{
+        left: px2rem(900);
+        top: px2rem(200);
+    }
+    .repeat-popup8 {
+        left: px2rem(900);
+        top: px2rem(200);
+    }
+    .repeat-popup10 {
+        left: px2rem(840);
+        top: px2rem(180);
+    }
+    .repeat-popup11 {
+        left: px2rem(840);
+        top: px2rem(180);
+    }
+    .repeat-popup13 {
+        left: px2rem(840);
+        top: px2rem(180);
+    }
+    .repeat-popup33 {
+        left: px2rem(680);
+        top: px2rem(100);
+        .popup-hd {
+            text-align: center;
+        }
+    }
 }

+ 1 - 1
2018专题/古剑奇谭8月/src/_index.html

@@ -29,7 +29,7 @@
             </p>
         </div>
         <div class="mod-part mod-banner">
-            <p class="video-play" data-vid="8923551"></p>
+            <p class="video-play" data-vid="8931745"></p>
         </div>
         <div class="mod-part mod-giftbag" id="lucky">
             <h2 class="mod-title title1"></h2>

+ 1 - 1
2018专题/古剑奇谭8月/src/modules/page/index.js

@@ -463,7 +463,7 @@ var C = {
                 content: '<div class="pop-flash">\
                 <div class="btn-close" i="close"></div>\
                 <div class="video-wrap">\
-                <embed id="'+vid+'" name="'+vid+'" src="http://assets.dwstatic.com/video/vppp.swf" wmode="transparent" allowfullscreen="true" quality="high" height="100%" width="100%" align="middle" allowscriptaccess="always" flashvars="auto_play=1&amp;vid='+vid+'&amp;channelId=hdzt&amp;logo=dw" type="application/x-shockwave-flash">\
+                <embed id="'+vid+'" name="'+vid+'" src="http://assets.dwstatic.com/video/vppp.swf" wmode="transparent" allowfullscreen="true" quality="high" height="100%" width="100%" align="middle" allowscriptaccess="always" flashvars="auto_play=1&no_ad=1&amp;vid='+vid+'&amp;channelId=hdzt&amp;logo=dw" type="application/x-shockwave-flash">\
                 </div></div>',
                 skin: "base-ui"
             }).showModal();