1

src/components/ComGameFailed/ComGameFailed.jsx

@@ -12,19 +12,29 @@ class ComGameFailed extends Component {
     this.state = this.state || { resList: resList };
   }
 
-  showIndex(){
+  showIndex() {
     this.props.closeWin();
     ViewCtrl.changePage();
   }
 
   render() {
     return (
-      <div className="chuang_guan_shi_bai10 zoom">
-        <img className="dan_chuang_bei_jing14" src={this.state.resList['9dee8a6c-0fef-4d77-9b78-bfdea719b5a8'].url} />
-        <img className="guan_bi_an_niu13" src={this.state.resList['28caebe0-9290-49fe-9661-ccc2c9885520'].url} onClick = {this.showIndex.bind(this)}/>
-        <img className="ji_xu_an_niu" src={this.state.resList['75652f25-ad45-435f-9d66-e1d784167052'].url} onClick = {this.showIndex.bind(this)}/>
-        <label className="hen_bao_qian12">很抱歉</label>
-        <label className="chuang_guan_shi_bai11">闯关失败</label>
+      // <div className="chuang_guan_shi_bai10 zoom">
+      //   <img className="dan_chuang_bei_jing14" src={this.state.resList['9dee8a6c-0fef-4d77-9b78-bfdea719b5a8'].url} />
+      //   <img className="guan_bi_an_niu13" src={this.state.resList['28caebe0-9290-49fe-9661-ccc2c9885520'].url} onClick = {this.showIndex.bind(this)}/>
+      //   <img className="ji_xu_an_niu" src={this.state.resList['75652f25-ad45-435f-9d66-e1d784167052'].url} onClick = {this.showIndex.bind(this)}/>
+      //   <label className="hen_bao_qian12">很抱歉</label>
+      //   <label className="chuang_guan_shi_bai11">闯关失败</label>
+      // </div>
+      <div className="hen_yi_han ">
+        <div className="dan_chuang ">
+          <img
+            className="dan_chuang_bei_jing__m "
+            src={this.state.resList['754826a9-6abd-4dea-b637-6f416ee3efdb'].url}
+          />
+          <span className="wei_zhong_jiang ">未中奖</span>
+          <img className="againBtn " src={this.state.resList['b4e8dd96-0752-454d-8db6-b897b26e0dde'].url} onClick={this.showIndex.bind(this)} />
+        </div>
       </div>
     );
   }

src/components/ComGameFailed/ComGameFailed.less

-.chuang_guan_shi_bai10 {
-  width: 520px;
-  height: 504px;
-  opacity: 1;
-  left: 120px;
-  top: 530px;
+.hen_yi_han {
+  top: 0px;
+  left: 0px;
+  width: 750px;
+  height: 1624px;
+  display: block;
   position: absolute;
-  transform-origin: 50% 50% 0px;
-  .dan_chuang_bei_jing14 {
-    width: 510px;
-    height: 504px;
+  .dan_chuang {
+    width: 659px;
+    height: 535px;
     opacity: 1;
+    vertical-center: -111.5;
+    left: 50px;
+    top: 345px;
     position: absolute;
     transform-origin: 0px 0px 0px;
+    .dan_chuang_bei_jing__m {
+      width: 659px;
+      height: 462px;
+      opacity: 1;
+      position: absolute;
+      transform-origin: 0px 0px 0px;
+    }
+    .wei_zhong_jiang {
+      width: 247px;
+      height: 49px;
+      opacity: 1;
+      left: 200px;
+      top: 233px;
+      position: absolute;
+      transform-origin: 0px 0px 0px;
+      font-size: 40px;
+      text-align: center;
+      color: rgba(255, 220, 197, 1);
+    }
+    .againBtn {
+      width: 469px;
+      height: 129px;
+      opacity: 1;
+      left: 91px;
+      top: 406px;
+      position: absolute;
+      transform-origin: 0px 0px 0px;
+    }
   }
-  .guan_bi_an_niu13 {
-    width: 57px;
-    height: 58px;
-    opacity: 1;
-    left: 463px;
-    top: 145px;
-    position: absolute;
-    transform-origin: 0px 0px 0px;
-  }
-  .ji_xu_an_niu {
-    width: 242px;
-    height: 59px;
-    opacity: 1;
-    left: 134px;
-    top: 399px;
-    position: absolute;
-    transform-origin: 0px 0px 0px;
-  }
-  .hen_bao_qian12 {
-    width: 507px;
-    height: 39px;
-    opacity: 1;
-    left: 0px;
-    top: 240px;
-    position: absolute;
-    transform-origin: 0px 0px 0px;
-    font-size: 41.66667px;
-    color: rgba(250, 36, 32, 1);
-    text-align: center;
-    font-weight: bold;
-  }
-  .chuang_guan_shi_bai11 {
-    width: 508px;
-    height: 35px;
-    opacity: 1;
-    left: 1px;
-    top: 310px;
-    position: absolute;
-    transform-origin: 0px 0px 0px;
-    font-size: 37.5px;
-    color: rgba(141, 4, 2, 1);
-    text-align: center;
-    font-weight: bold;
-  }
-}
+}
\ No newline at end of file

src/components/ComGameSuccess/ComGameSuccess.jsx

@@ -13,7 +13,8 @@ class ComGameSuccess extends Component {
             resList: resList,
             bgSource: "",
             btnSource: "",
-            scoreClass: "score "
+            scoreClass: "score ",
+            tipsClass: "tips "
         };
     }
 
@@ -22,10 +23,12 @@ class ComGameSuccess extends Component {
             this.setState({ bgSource: this.state.resList['86e6d9b6-1494-4404-9b16-c5c560291f9a'].url })
             this.setState({ btnSource: this.state.resList['ce76f2ba-1e2b-4372-98ab-f22c559bc2c1'].url })
             this.setState({ scoreClass: "score red", })
+            this.setState({ tipsClass: "tips red", })
         } else {
             this.setState({ bgSource: this.state.resList['24270f9f-5fcb-4a8c-b9e3-f6cd9a974609'].url })
             this.setState({ btnSource: this.state.resList['819dffa8-a443-468f-a487-8ef8d9702adc'].url })
             this.setState({ scoreClass: "score gold", })
+            this.setState({ tipsClass: "tips gold", })
         }
     }
 
@@ -38,7 +41,7 @@ class ComGameSuccess extends Component {
         return (
             <div className="ComGameSuccess">
                 <img className="bg" src={this.state.bgSource} />
-                <span className="tips">本局收集好运值</span>
+                <span className={this.state.tipsClass}>本局收集好运值</span>
                 <span className={this.state.scoreClass} >{this.props.data.score}</span>
                 <img className="submitBtn " src={this.state.btnSource} onClick={this.gameSubmit.bind(this)} />
             </div>

src/components/ComGameSuccess/ComGameSuccess.less

@@ -40,10 +40,10 @@
     color: rgba(254, 234, 187, 1);
   }
   .red {
-      color:"rgba(254, 234, 187, 1)"
+      color:#feeabb
   }
   .gold {
-      color:"#EE6612"
+      color:#EE6612
   }
   .submitBtn {
     width: 469px;

src/pages/pagecanvas/pagecanvas.jsx

@@ -29,7 +29,8 @@ class PageCanvas extends Component {
 
     componentWillUnmount() {
         var that = this;
-        document.removeEventListener("GAME_OVER", that.gameOver, that);
+
+        this.main.removeGlobalEvent("GAME_OVER", this.gameOver, this)
     }
     /**
      * 模板自动生成。不参与转换,请勿在此方法内修改逻辑。

src/resconfig/resList.js

@@ -262,6 +262,18 @@ const resList = {
     ext: '.png',
     url: '//yun.duiba.com.cn/spark/assets/jdt.d2d9b4a56637c0c74eab3896f30cd396ffc1ab3d.png',
     uuid: 'b68293a3-a303-4f95-a141-56b148367c48'
+  },
+  '754826a9-6abd-4dea-b637-6f416ee3efdb': {
+    name: '弹窗背景__m',
+    ext: '.png',
+    uuid: '754826a9-6abd-4dea-b637-6f416ee3efdb',
+    url: '//yun.duiba.com.cn/spark/assets/a3b4bde96e62f576f68cf54738d20e3b60478939.png'
+  },
+  'b4e8dd96-0752-454d-8db6-b897b26e0dde': {
+    name: '按钮__m',
+    ext: '.png',
+    uuid: 'b4e8dd96-0752-454d-8db6-b897b26e0dde',
+    url: '//yun.duiba.com.cn/spark/assets/628a8bf7fcc596e497566213a28ba3efc1f752d0.png'
   }
 };
 export default resList;
\ No newline at end of file