Merge branch 'master' of gitlab2.dui88.com:wildfirecode13/icbcrpg into 引导load选人

b016f4d6 · zhangjinzhou · f3ab4b4a · a2428c50 · b016f4d6 · b016f4d6
Commit b016f4d6 authored Dec 30, 2020 by zhangjinzhou
7 changed files
--- a/project/mock/e-family/index.js
+++ b/project/mock/e-family/index.js
@@ -4,8 +4,8 @@ export const homeInfo = {
    {
        "canUpdateNickName": false,
        "figures": [{ "figureId": "1" }, { "figureId": "2" }, { "figureId": "3" }],
-        "newUser": 0,
-        "userInfo": { "figureId": "3", "joyBeans": 10100, "nickName": "13" }
+        "newUser": 1,
+        "userInfo": { "figureId": "3", "joyBeans": 123456789123, "nickName": "13" }
    },
    "message": null,
    "success": true

--- a/project/public/index.html
+++ b/project/public/index.html
@@ -5,7 +5,7 @@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
  <meta name="theme-color" content="#000000">
-  <title>e趣小镇</title>
+  <title>生活小镇</title>
  <script src="getTokenKey" id="scriptkey"></script>
  <script id="scriptjs" src="//yun.duiba.com.cn/js-libs/px-token/0.0.4/px-token.min.js"></script>
  <script src="//yun.duiba.com.cn/js-libs/rem/1.1.0/rem.min.js"></script>
@@ -75,15 +75,15 @@
  </script>


-<script src="https://yun.duiba.com.cn/db_games/debug/vconsole.min.js"></script>
-<script>
-// init vConsole
-var vConsole = new VConsole();
-console.log('Hello world 111');
-</script>
+  <script src="https://yun.duiba.com.cn/db_games/debug/vconsole.min.js"></script>
+  <script>
+    // init vConsole
+    var vConsole = new VConsole();
+    console.log('Hello world 111');
+  </script>


-<!-- <script src="https://js.fundebug.cn/fundebug.2.0.0.min.js"
+  <!-- <script src="https://js.fundebug.cn/fundebug.2.0.0.min.js"
  apikey="3c42ab77f11dbafe99934f87acae7cc6077a5ef3f5920f1eb753b247d330b597" crossorigin="anonymous"></script> -->



--- a/project/src/pages/loading/loading.jsx
+++ b/project/src/pages/loading/loading.jsx
@@ -130,7 +130,7 @@ class Loading extends Component {
        <img
          className="loading_front "
          uuid="0fadc807-1e4c-45df-9cb8-db801c1a5426"
-          src={this.state.resList['042d5356-2585-46db-889d-664a8100598e'].url}
+          src="//yun.duiba.com.cn/spark/assets/b0640cb00316b2e9b25ca0967151d766ba209ed6.png"
        />
        <img
          className="loading_progress "

--- a/project/src/pages/main3/main3.jsx
+++ b/project/src/pages/main3/main3.jsx
@@ -59,7 +59,7 @@ class Main3 extends Component {
    const urlmap = {
      ganji:'https://gonghang.activity-1.m.duiba.com.cn/projectx/pa14d7c75/index.html?appID=66480',
      equnongchang:'https://gonghang.activity-1.m.duiba.com.cn/projectx/pdc4fd1cc/index.html?appID=66480',
-      wodeejia:'https://baidu.com?wodeejia',
+      wodeejia:'https://gonghang.activity-1.m.duiba.com.cn/projectx/pdc4fd1cc/index.html?appID=66480&gohome=true',
    }
    console.log('goto',urlmap[type])
    location.href=urlmap[type]
@@ -199,7 +199,7 @@ class Main3 extends Component {
        <img
          className="main3_bg "
          uuid="25a6c3f8-3f78-4758-b2ab-5bcbfaa0d8bc"
-          src={this.state.resList['caebeec6-fe80-4c78-a132-d911f97a81b6'].url}
+          src="//yun.duiba.com.cn/spark/assets/3dff859e5097ca38eebf736863ea0344dfc1ac76.png"
        />
        <div className="main3_top " uuid="257105ac-5616-4e29-a4dc-302ed2604193">
          <div
@@ -231,7 +231,7 @@ class Main3 extends Component {
              />
            )}
            <span className="main3_num " uuid="018875e0-9592-4854-ba0b-2cd58464a6a2">
-              欢趣豆：{joyBeans}
+              欢趣豆:{joyBeans}
            </span>
            <span  className="main3_nick " uuid="a7518930-17cc-427a-a6e5-27a593b309c4">
              {nickName}
@@ -311,7 +311,7 @@ class Main3 extends Component {
        {rolepop&&<img
          className="main3_rolepop "
          uuid="c27fef65-4506-42f8-85df-207999e11de1"
-          src={this.state.resList['56b64b91-4e9a-49bd-bfd0-20d10b6e6556'].url}
+          src="//yun.duiba.com.cn/spark/assets/77234d6cb9376e89e6aea4d13009b3f859f36197.png"
        />}

        {needguide ? <CanvasWidget className="diacontmidpos canvasLayer" widgetFactory={Guideact} widgetConfig={widgetConfig}

--- a/project/src/pages/main3/main3.less
+++ b/project/src/pages/main3/main3.less
@@ -76,7 +76,7 @@
        width: 50px;
        height: 19px;
        left: 295px;
-        top: 59px;
+        top: 30px;
        position: absolute;
      }
    }

--- a/project/src/pages/main3/widgetConfig copy.js.bak
+++ b/project/src/pages/main3/widgetConfig copy.js.bak
+import dataCenter, { Store } from "../../dataCenter";
+
+let clientWidth = document.body.clientWidth;
+let clientHeight = document.body.clientHeight;
+
+let canvaswid = 750;
+let canvashei = clientHeight * 750 / clientWidth;
+
+let holedata = {
+    holetype: "cirect",
+    holex: 15,
+    holey: 33,
+    holesize: [
+        395,
+        112,
+        70
+    ]
+}
+
+let txtdata = {
+    text: "您可以在此处编辑信息查看欢趣豆数量",
+    txtwidth: 750,
+    txtx: 0,
+    txty: 224,
+    txtalign: "center"
+}
+
+let roledata = [
+    {
+        rolex: 375,
+        roley: canvashei - 550,
+    }
+]
+
+let nextbtndata = {
+    btnx: 485,
+    btny: 303,
+    btntex: "nextbtn"
+}
+
+let skipbtndata = {
+    skipx: (canvaswid - 107) / 2,
+    skipy: canvashei - 200,
+    skiplevel: 9,
+    skiptex: "skipbtn",
+};
+
+let touchdata = {
+    touchx: 0,
+    touchy: 0,
+    touchsize: [
+        canvaswid,
+        canvashei
+    ]
+}
+
+
+
+function getstep1() {
+    return {
+        hole: null,
+        txt: null,
+        role: roledata,
+        nextbtn: null,
+        goldprize:dataCenter.getData(Store.newgoldnum)||0,
+        skipbtn: skipbtndata,
+        touch: touchdata,
+        pagey: 0,
+    }
+}
+function getstep2(){
+    return {
+        hole: {
+          holetype: "cirect",
+          holex: 15,
+          holey: 33,
+          holesize: [
+            395,
+            112,
+            70
+          ]
+        },
+        txt: {
+          text: "您可以在此处编辑信息查看欢趣豆数量",
+          txtwidth: 750,
+          txtx: 0,
+          txty: 224,
+          txtalign: "center"
+        },
+        role: roledata,
+        nextbtn: {
+          btnx: 485,
+          btny: 303,
+          btntex: "nextbtn"
+        },
+        skipbtn: skipbtndata,
+        touch: touchdata,
+        pagey: 0,
+      }
+}
+function getstep3(){
+    return {
+        hole: {
+          holetype: "cirect",
+          holex: 600,
+          holey: 26,
+          holesize: [
+            135,
+            440,
+            40
+          ]
+        },
+        txt: {
+          text: "点击图标您可查看规则、进行分享和签到\n \n偷偷告诉您，连签7天可获得大额欢趣豆哦～",
+          txtwidth: 455,
+          txtx: 100,
+          txty: 245,
+          txtalign: "left"
+        },
+        role: roledata,
+        nextbtn: {
+          btnx: 100,
+          btny: 520,
+          btntex: "nextbtn"
+        },
+        skipbtn: skipbtndata,
+        touch: touchdata,
+        pagey: 0,
+      }
+}
+function getstep4(){
+    return {
+        hole: {
+          holetype: "cir",
+          holex: 185,
+          holey: 465,
+          holesize: [
+            165,
+            440
+          ]
+        },
+        txt: {
+          text: "欢趣豆可以兑换立减金，\n进入趣赶集即可进行\n兑换哦～",
+          txtwidth: 375,
+          txtx: 375,
+          txty: 150,
+          txtalign: "left"
+        },
+        role: roledata,
+        nextbtn: {
+          btnx: 375,
+          btny: 336,
+          btntex: "nextbtn"
+        },
+        skipbtn: skipbtndata,
+        touch: touchdata,
+        pagey: 0,
+      }
+}
+function getstep5(){
+    return {
+        hole: {
+          holetype: "cir",
+          holex: 540,
+          holey: 600,
+          holesize: [
+            165,
+            440
+          ]
+        },
+        txt: {
+          text: "农场主集结～在这里\n就是向往的生活！\n收获成果的同时还可\n以兑换丰厚礼物哦",
+          txtwidth: 320,
+          txtx: 55,
+          txty: 580,
+          txtalign: "left"
+        },
+        role: [
+          {
+              rolex: 0,
+              roley: 180,
+          }
+        ],
+        nextbtn: {
+          btnx: 55,
+          btny: 780,
+          btntex: "nextbtn"
+        },
+        skipbtn: skipbtndata,
+        touch: touchdata,
+        pagey: 0,
+      }
+}
+function getstep6(){
+    return {
+        hole: {
+          holetype: "cir",
+          holex: 170,
+          holey: 820,
+          holesize: [
+            165,
+            440
+          ]
+        },
+        txt: {
+          text: "点击任务大厅，进入\n任务界面，完成任务\n可获得好礼哦～",
+          txtwidth: 375,
+          txtx: 375,
+          txty: 500,
+          txtalign: "left"
+        },
+        role: [{
+          rolex:0,
+          roley:200
+        }],
+        nextbtn: {
+          btnx: 375,
+          btny: 665,
+          btntex: "nextbtn"
+        },
+        skipbtn: skipbtndata,
+        touch: touchdata,
+        pagey: 0,
+      }
+}
+function getstep7(){
+    let offsety = 0;
+    let holly = 1110;
+    if ((holly + 165 / 2) > canvashei - 300) {
+      let holly1 = canvashei - 300 - 165 / 2;
+      offsety = holly - holly1;
+    }
+    if(canvashei+offsety>1624){
+        offsety = 1624-canvashei;
+    }
+    return {
+        hole: {
+          holetype: "cir",
+          holex: 575,
+          holey: 1110 - offsety,
+          holesize: [
+            165,
+            440
+          ]
+        },
+        txt: {
+          text: "点击小卖铺可以进到\n商城页面，在这里购\n买心仪的物品哦～",
+          txtwidth: 320,
+          txtx: 85,
+          txty: 750 - offsety,
+          txtalign: "left"
+        },
+        role: [
+          {
+            rolex: 375,
+            roley: 100,
+            roletex: "guide2_1"
+          }
+        ],
+        nextbtn: {
+          btnx: 86,
+          btny: 910 - offsety,
+          btntex: "nextbtn"
+        },
+        skipbtn: skipbtndata,
+        touch: touchdata,
+        pagey: offsety,
+      }
+}
+function getstep8(){
+    let offsety = 0;
+    let holly = 1325;
+    if ((holly + 165 / 2) > canvashei - 300) {
+      let holly1 = canvashei - 300 - 165 / 2;
+      offsety = holly - holly1;
+    }
+    if(canvashei+offsety>1624){
+        offsety = 1624-canvashei;
+    }
+    return {
+        hole: {
+          holetype: "cir",
+          holex: 180,
+          holey: 1325 - offsety,
+          holesize: [
+            165,
+            440
+          ]
+        },
+        txt: {
+          text: "这就是你的小家啦～\n进入我的e家可以查看在小\n镇获得的各项荣誉勋章",
+          txtwidth: 375,
+          txtx: 375,
+          txty: 1100 - offsety,
+          txtalign: "left"
+        },
+        role: [
+          {
+            rolex: 220,
+            roley: 100,
+            roletex: "guide2_1"
+          }
+        ],
+        nextbtn: {
+          btnx: 375,
+          btny: 1280 - offsety,
+          btntex: "nextbtn"
+        },
+        skipbtn: skipbtndata,
+        touch: touchdata,
+        pagey: offsety,
+      }
+}
+function getstep9(){
+    return {
+        hole: null,
+        txt: {
+          text: "小镇将会越来越热闹\n小e也会在这儿一直陪伴你哦，\n那么赶紧去逛逛吧～",
+          txtwidth: 750,
+          txtx: 0,
+          txty: canvashei - 400,
+          txtalign: "center"
+        },
+        role: [
+          {
+            rolex: 0,
+            roley: (canvashei-1624)/2-250,
+            roletex: "guide2_1"
+          }
+        ],
+        nextbtn: {
+          btnx: 250,
+          btny: canvashei - 250,
+          btntex: "finaguidebtn"
+        },
+        skipbtn: null,
+        touch: touchdata,
+        pagey: 0,
+      }
+}
+export function getStepData() {
+    let stepdata1 = getstep1();
+    let stepdata2 = getstep2();
+    let stepdata3 = getstep3();
+    let stepdata4 = getstep4();
+    let stepdata5 = getstep5();
+    let stepdata6 = getstep6();
+    let stepdata7 = getstep7();
+    let stepdata8 = getstep8();
+
+    let stepdata9 = getstep9();
+    return {
+        1:stepdata1,
+        2:stepdata2,
+        3:stepdata3,
+        4:stepdata4,
+        5:stepdata5,
+        6:stepdata6,
+        7:stepdata7,
+        8:stepdata8,
+        9:stepdata9,
+    }
+}
+export let widgetConfig = {
+    props: {
+
+    },
+    assets: [
+
+    ]
+}
\ No newline at end of file
--- a/project/src/pages/main3/widgetConfig.js
+++ b/project/src/pages/main3/widgetConfig.js
@@ -129,33 +129,33 @@ function getstep3(){
      }
 }
 function getstep4(){
-    return {
-        hole: {
-          holetype: "cir",
-          holex: 185,
-          holey: 465,
-          holesize: [
-            165,
-            440
-          ]
-        },
-        txt: {
-          text: "欢趣豆可以兑换立减金，\n进入趣赶集即可进行\n兑换哦～",
-          txtwidth: 375,
-          txtx: 375,
-          txty: 357,
-          txtalign: "left"
-        },
-        role: roledata,
-        nextbtn: {
-          btnx: 375,
-          btny: 536,
-          btntex: "nextbtn"
-        },
-        skipbtn: skipbtndata,
-        touch: touchdata,
-        pagey: 0,
-      }
+  return {
+      hole: {
+        holetype: "cir",
+        holex: 185,
+        holey: 465,
+        holesize: [
+          165,
+          440
+        ]
+      },
+      txt: {
+        text: "欢趣豆可以兑换立减金，\n进入趣赶集即可进行\n兑换哦～",
+        txtwidth: 375,
+        txtx: 375,
+        txty: 150,
+        txtalign: "left"
+      },
+      role: roledata,
+      nextbtn: {
+        btnx: 375,
+        btny: 336,
+        btntex: "nextbtn"
+      },
+      skipbtn: skipbtndata,
+      touch: touchdata,
+      pagey: 0,
+    }
 }
 function getstep5(){
    return {
@@ -361,6 +361,11 @@ export let widgetConfig = {

    },
    assets: [
-
+      {
+        "name": "引导1图",
+        "url": "//yun.duiba.com.cn/spark/assets/b9cd839f5ea8a1eebebfaa74ea34c664cb58f084.png",
+        "uuid": "guide1",
+        "ext": ".png"
+      }
    ]
 }
\ No newline at end of file