Skip to content

R
RB_StrongestBrain_250520
Commit 634b4bb2 authored by 韦燕's avatar 韦燕
Browse files
Options

featmerge

parents 26364962 ef6522e0
Hide whitespace changes
Inline Side-by-side
Showing with 756 additions and 138 deletions
README.md
View file @ 634b4bb2
......@@ -2,3 +2,23 @@
# 为了消除疯火台影响,特地做此框架,建设中,未完工
# ====线上测试投放链接====
1.管家App
1.1活动地址（需重定向白名单）：
https://96094-2-activity.m.dexfu.cn/customShare/share?id=Did1NjEwODc
1.2 奖品页地址（需重定向白名单）：
https://96094-2-activity.m.dexfu.cn/customShare/share?id=Did1NjEwNzk
2.人保寿险企业家助手微信公众号（channel=2）提供中间页地址：
https://96094-2-activity.m.dexfu.cn/customShare/share?id=Did1NjEwOTU&projectID=pbad47607
3.友客微信公众号&友客小程序（channel=3、5）需携带code参数
https://96094-2-activity.m.dexfu.cn/customShare/share?id=Did1NjExMDM
4.e服务公众号
https://96094-2-activity.m.dexfu.cn/customShare/share?id=Did1NjExMTE&projectID=pbad47607&actId=6134&fourSeason=1 
5.客经投放渠道（channel=6/7/8）：包含E通、友客、微通（会透传actPlatforms,actid,agentCode参数）
https://96094-2-activity.m.dexfu.cn/customShare/share?id=Did1NjEwNzE
dist/index.html
View file @ 634b4bb2
......@@ -99,10 +99,10 @@
// alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
}
</script>
<script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747978816250/assets/index-CGdWX048.js"></script>
<link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747978816250/assets/vendor-CLJsmJ4G.js">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747978816250/assets/vendor-NZxPxbcK.css">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747978816250/assets/index-jyJrhV5n.css">
<script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747982309021/assets/index-Dl-xTHIV.js"></script>
<link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747982309021/assets/vendor-Bq4lO2GB.js">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747982309021/assets/vendor-NZxPxbcK.css">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747982309021/assets/index-CCbTtttf.css">
<script type="module">import.meta.url;import("_").catch(()=>1);(async function*(){})().next();if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
<script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
</head>
......@@ -110,8 +110,8 @@
<body>
<div id="root"></div>
<script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
<script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1747978816250/assets/polyfills-legacy-arANKBzQ.js"></script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1747978816250/assets/index-legacy-BugzU435.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
<script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1747982309021/assets/polyfills-legacy-arANKBzQ.js"></script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1747982309021/assets/index-legacy-BuuQJyuE.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
</body>
</html>
\ No newline at end of file
mock/main.ts
View file @ 634b4bb2
......@@ -9,11 +9,12 @@ export default [
"message": "message",
"data": {
"actStartTimestamp": -86961592.20219234,
"answerChance": 61684762.582832515,
"rank": 85345186.95448217,
"uid": "laboris Lorem sit officia aliqua",
"answerChance": 666,
"rank": 1,
"uid": "123213",
"currentTimestamp": 99790918.1204935,
"actEndTimestamp": 42625488.007563084,
"avatar": "/src/assets/homePage/head.png",
"privacyText":'143sjhbkrjgjkfgbjfb fnsjnfdrhgkfngjknfcmgfcm fjkxdngjhrdkghkfxgjfb',
"rankPop1": {
"prizeName": null,
......@@ -25,7 +26,7 @@ export default [
"validUid": true,
"isAgent": true,
"boundYkCode": "eiusmod in dolor",
"minim_0": 93293912
"agreePrivacy": true,
}
}
},
......
src/App.tsx
View file @ 634b4bb2
......@@ -25,6 +25,8 @@ import { onInitShare } from './utils/share.js';
import { domain, ensureDomain } from "@spark/dbdomain";
import shareStore from './store/share.js';
import music from "../src/assets/audio/bgm.mp3";
@observer
class App extends Component {
......@@ -35,11 +37,13 @@ class App extends Component {
myPrize: MyPrize, // TODO 举例子 新宿台奖品页
index: HomePage,
sharepage:SharePage,
}[skinId] || HomePage;
}[skinId] || GamePage;
PageCtrl.changePage(defaultPage);
}
async componentDidMount() {
musicStore.playSound( music, true);
this.showDefaultPage();
await store.getFrontVariable();
......
src/assets/common/music_close.png
View replaced file @ 26364962 View file @ 634b4bb2
src/assets/common/music_close.png

1.75 KB | W: | H:

src/assets/common/music_close.png

2.73 KB | W: | H:

src/assets/common/music_close.png
src/assets/common/music_close.png
src/assets/common/music_close.png
src/assets/common/music_close.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/common/music_open.png
View replaced file @ 26364962 View file @ 634b4bb2
src/assets/common/music_open.png

1.63 KB | W: | H:

src/assets/common/music_open.png

2.57 KB | W: | H:

src/assets/common/music_open.png
src/assets/common/music_open.png
src/assets/common/music_open.png
src/assets/common/music_open.png
  • 2-up
  • Swipe
  • Onion skin
src/components/LoginPop/LoginPop.jsx
View file @ 634b4bb2
......@@ -45,18 +45,31 @@ class LoginPop extends React.Component {
this.setState({
isSend: false,
reSend: true,
},()=>{
sensorLog(LOG_KEY.exposure, "b14257", "d14259", {
page_name: "手机号登录页",
button_name: "重新发送按钮",
});
});
}
}, 1000);
};
clickSend = _asyncThrottle(async () => {
sensorLog(LOG_KEY.click, "b14257", "d14258", {
page_name: "手机号登录页",
button_name: "发送验证码按钮",
});
const {phone, reSend} = this.state;
if(reSend){
sensorLog(LOG_KEY.click, "b14257", "d14259", {
page_name: "手机号登录页",
button_name: "重新发送按钮",
});
}else{
sensorLog(LOG_KEY.click, "b14257", "d14258", {
page_name: "手机号登录页",
button_name: "发送验证码按钮",
});
}
const {phone} = this.state;
if (!phone) {
return Toast.show("请输入手机号");
}
......
src/components/settlechance/settlechance.jsx
View file @ 634b4bb2
......@@ -36,8 +36,10 @@ class Settlechance extends React.Component {
const { data } = this.props || {};
const {
drawChance = 0,
title = "银河系脑洞霸主",
desc = "你的脑洞能凭空造出‘榴莲味wiFi’和‘会蹦迪的沙发’,建议去给科幻片当编剧，拯救全人类！",
title = "",
desc = "",
img = "",
score = 0,
} = data || {};
return (
<div className="settlechance modal_center">
......@@ -45,9 +47,12 @@ class Settlechance extends React.Component {
<span className="bg"></span>
<Button className="draw" onClick={this.handleDraw} />
<Button className="know" onClick={this.handleKnow} />
<span className="icon"></span>
<img className="icon"
src = {img}
alt = {title}
/>
<span className="ribbon"></span>
<span className="title">恭喜您, 答对{0}题</span>
<span className="title">恭喜您, 答对{score}题</span>
<span className="tip1">获得了「{title}」称号</span>
<span className="tip2">{desc}</span>
<span className="tip3">恭喜获得抽奖机会+{drawChance}</span>
......
src/components/settlechance/settlechance.less
View file @ 634b4bb2
......@@ -55,7 +55,7 @@
left: 242px;
top: 540px;
position: absolute;
.sparkBg("settleChance/icon.png");
// .sparkBg("settleChance/icon.png");
}
.title {
......@@ -99,7 +99,7 @@
width: 460px;
height: 84px;
left: 134px;
top: 807px;
top: 817px;
text-align: center;
position: absolute;
font-size: 22px;
......
src/components/settlenochance/settlenochance.jsx
View file @ 634b4bb2
......@@ -7,6 +7,9 @@ import { Button, Toast } from '@grace/ui';
import { _asyncThrottle } from "../../utils/utils";
import { PageCtrl } from "@/core/ctrls/PageCtrl";
import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
import { SvgaPlayer } from "@grace/svgaplayer";
import lightSvga from "../../assets/svga/6输出弹窗.svga";
import { LOG_KEY, MatterShareOpt, MatterViewDuration, MatterViewOpt, pageView, sensorLog } from "../../utils/sensors.js";
@observer
......@@ -41,17 +44,36 @@ class Settlenochance extends React.Component {
button_name: "我知道了按钮",
});
}
handleClose = _asyncThrottle(() => {
ModalCtrl.closeModal()
})
handleKnow = _asyncThrottle(() => {
ModalCtrl.closeModal()
})
render() {
const { data } = this.props || {};
const {
title = "",
desc = "",
img = "",
score = 0,
} = data || {};
return (
<div className="settlenochance modal_center">
<span className="dongxiao"></span>
<SvgaPlayer className="light" src={lightSvga} />
<span className="bg"></span>
<span className="know"></span>
<span className="icon"></span>
<span className="title"></span>
<span className="tip1">获得了「宇宙菜鸟」称号</span>
<span className="tip2">你的脑洞像刚解冻的冰棍——梆硬且毫无波澜，建议多喝热水重启大脑！</span>
<span className="close"></span>
<Button className="know" onClick={this.handleKnow} />
<img className="icon"
src = {img}
alt = {title}
/>
<span className="ribbon"></span>
<span className="title">恭喜您, 答对{score}题</span>
<span className="tip1">获得了「{title}」称号</span>
<span className="tip2">{desc}</span>
<Button className="close" onClick={this.handleClose} />
</div>
);
}
......
src/components/settlenochance/settlenochance.less
View file @ 634b4bb2
@import "../../res.less";
.settlenochance {
width: 750px;
height: 1624px;
left: 0px;
top: 0px;
position: absolute;
.dongxiao {
@font-face {
font-family: "MaokenAssortedSans";
src: url('/src/assets/font/MaokenAssortedSans.ttf') format('truetype');
// font-display: swap;
}
.light {
width: 750px;
height: 1008px;
height: 1624px;
left: 0px;
top: 324px;
// top: 213px;
position: absolute;
.sparkBg("settleNoChance/dongxiao.png");
// .sparkBg("settleChance/dongxiao.png");
}
.bg {
width: 606px;
height: 724px;
......@@ -21,6 +30,7 @@
position: absolute;
.sparkBg("settleNoChance/bg.png");
}
.know {
width: 263px;
height: 92px;
......@@ -29,41 +39,71 @@
position: absolute;
.sparkBg("settleNoChance/know.png");
}
.icon {
width: 198px;
height: 198px;
left: 271px;
top: 686px;
position: absolute;
.sparkBg("settleNoChance/icon.png");
// .sparkBg("settleNoChance/icon.png");
}
.title {
// width: 636px;
width: 750px;
height: 201px;
// left: 138px;
left: -10px;
top: 288+100px;
font-size: 62px;
text-align: center;
position: absolute;
color: rgb(255, 245, 214);
font-family: "MaokenAssortedSans";
}
.ribbon {
width: 636px;
height: 201px;
left: 32px;
top: 325px;
left: 30px;
top: 214+100px;
position: absolute;
.sparkBg("settleNoChance/title.png");
.sparkBg("settleChance/ribbon.png");
}
.tip1 {
width: 338px;
height: 29px;
left: 200px;
width: 460px;
height: 33px;
left: 134px;
top: 599px;
text-align: center;
position: absolute;
font-size: 30px;
line-height: 29px;
line-height: 33px;
color: rgba(153, 57, 27, 1);
font-weight: bold;
.lineClamp1();
}
.tip2 {
width: 429px;
height: 55px;
left: 156px;
top: 935px;
width: 460px;
height: 84px;
left: 134px;
top: 925px;
text-align: center;
position: absolute;
font-size: 21px;
font-size: 22px;
line-height: 38px;
color: rgba(169, 90, 62, 1);
// .lineClamp1();
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
}
.close {
width: 64px;
height: 64px;
......@@ -72,4 +112,4 @@
position: absolute;
.sparkBg("settleNoChance/close.png");
}
}
}
\ No newline at end of file
src/pages/GamePage/Game.ts
View file @ 634b4bb2
......@@ -14,6 +14,7 @@ import { Level8 } from "@/pages/GamePage/Level/Level8.ts";
import { Level9 } from "@/pages/GamePage/Level/Level9.ts";
import { Level10 } from "@/pages/GamePage/Level/Level10.ts";
import { Level11 } from "@/pages/GamePage/Level/Level11.ts";
import { Level12 } from "@/pages/GamePage/Level/Level12.ts";
import { Level13 } from "@/pages/GamePage/Level/Level13.ts";
import { Level14 } from "@/pages/GamePage/Level/Level14.ts";
import { Level15 } from "@/pages/GamePage/Level/Level15.ts";
......@@ -23,6 +24,7 @@ import { Level20 } from "@/pages/GamePage/Level/Level20.ts";
import { Level21 } from "@/pages/GamePage/Level/Level21.ts";
import { Level22 } from "@/pages/GamePage/Level/Level22.ts";
import { Level23 } from "@/pages/GamePage/Level/Level23.ts";
import { Level24 } from "@/pages/GamePage/Level/Level24.ts";
import gameStore from "@/store/gameStore.ts";
import { LevelArr } from "@/pages/GamePage/Level/LevelConfig.ts";
import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
......
src/pages/GamePage/Level/Level10.ts
View file @ 634b4bb2
......@@ -29,7 +29,7 @@ export class Level10 extends LevelBase {
this.A = this.addChild(new Sprite(Assets.get(`level${this.level}/A.png`)));
this.A.position.set(81, 903);
this.right = this.addChild(new Sprite(Assets.get(`level${this.level}/right.png`)));
this.right = this.addChild(new Sprite(Assets.get(`common/right.png`)));
this.right.position.set(656, 1002);
this.right.alpha = 0;
this.right.interactive = false;
......
src/pages/GamePage/Level/Level11.ts
View file @ 634b4bb2
......@@ -29,7 +29,7 @@ export class Level11 extends LevelBase {
this.A.position.set(541, 956);
this.A.scale.set(0.5746031746031746);
this.right = this.addChild(new Sprite(Assets.get(`level${this.level}/right.png`)));
this.right = this.addChild(new Sprite(Assets.get(`common/right.png`)));
this.right.position.set(642, 1141);
this.right.alpha = 0;
this.right.interactive = false;
......
src/pages/GamePage/Level/Level12.ts 0 → 100644
View file @ 634b4bb2
import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
import { Assets, Sprite, Graphics } from "pixi.js";
import { Ease, Tween } from "@/core/tween";
import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
import { getApp } from "../GamePage";
export class Level12 extends LevelBase {
level: number = 12;
A: Sprite; // 头
B: Sprite; // 尾
right: Sprite;
// 滑动轨迹相关
private trailGraphics: Graphics;
private isDrawing: boolean = false;
private startPoint: { x: number, y: number } | null = null;
private currentPoint: { x: number, y: number } | null = null;
// 香烟分离状态
private isSeparated: boolean = false;
onLoad() {
super.onLoad();
this.A = this.addChild(new Sprite(Assets.get(`level${this.level}/头.png`)));
this.A.position.set(67, 923);
this.B = this.addChild(new Sprite(Assets.get(`level${this.level}/尾.png`)));
this.B.position.set(265, 923);
this.right = this.addChild(new Sprite(Assets.get(`common/right.png`)));
this.right.position.set(613, 1104);
this.right.alpha = 0;
this.right.interactive = false;
this.right.eventMode = "none";
// 创建绘制轨迹的Graphics对象
this.trailGraphics = this.addChild(new Graphics());
this.trailGraphics.zIndex = 1000; // 确保轨迹在最上层
// 启用stage交互
const app = getApp();
app.stage.interactive = true;
app.stage.eventMode = "static";
// 在stage上监听全局事件
app.stage.on("pointerdown", this.onPointerDown, this);
app.stage.on("globalpointermove", this.onPointerMove, this);
app.stage.on("pointerup", this.onPointerUp, this);
app.stage.on("pointerupoutside", this.onPointerUp, this);
}
onPointerDown(e) {
if (this.isSeparated) return;
console.log("开始滑动", e.data.global);
this.isDrawing = true;
this.startPoint = { x: e.data.global.x, y: e.data.global.y };
this.currentPoint = { x: e.data.global.x, y: e.data.global.y };
// 清除之前的轨迹
this.trailGraphics.clear();
console.log("清除轨迹，开始新的绘制");
}
onPointerMove(e) {
if (!this.isDrawing || this.isSeparated) return;
this.currentPoint = { x: e.data.global.x, y: e.data.global.y };
console.log("更新轨迹点", this.currentPoint);
// 绘制轨迹线条
this.drawTrail();
}
onPointerUp(e) {
if (!this.isDrawing || this.isSeparated) return;
console.log("结束滑动", "起点:", this.startPoint, "终点:", this.currentPoint);
this.isDrawing = false;
// 检查滑动轨迹是否经过香烟
if (this.checkTrailCrossedCigarette()) {
this.separateCigarette();
} else {
// 如果没有成功分离，清除轨迹
console.log("没有经过香烟，清除轨迹");
setTimeout(() => {
this.clearTrail();
}, 1000);
}
}
drawTrail() {
if (!this.startPoint || !this.currentPoint) return;
console.log("绘制轨迹，起点:", this.startPoint, "终点:", this.currentPoint);
this.trailGraphics.clear();
// 绘制从起点到终点的直线
this.trailGraphics.moveTo(this.startPoint.x, this.startPoint.y);
this.trailGraphics.lineTo(this.currentPoint.x, this.currentPoint.y);
this.trailGraphics.stroke({ width: 6, color: 0xffffff });
console.log("轨迹绘制完成，起点:", this.startPoint, "终点:", this.currentPoint);
}
checkTrailCrossedCigarette(): boolean {
if (!this.startPoint || !this.currentPoint) return false;
// 香烟的水平线段：从A的x到B的x+width
const cigaretteStartX = this.A.x;
const cigaretteEndX = this.B.x + this.B.width;
const cigaretteY = this.A.y + (this.A.height / 2); // 使用香烟中间的y坐标
console.log("香烟线段:", cigaretteStartX, "到", cigaretteEndX, "y坐标:", cigaretteY);
// 检查轨迹线段是否与香烟水平线段相交
const startY = this.startPoint.y;
const endY = this.currentPoint.y;
// 检查轨迹线段是否在y方向上跨越了香烟线段
if ((startY <= cigaretteY && endY >= cigaretteY) || (startY >= cigaretteY && endY <= cigaretteY)) {
// 计算轨迹线段在cigaretteY处的x坐标
const startX = this.startPoint.x;
const endX = this.currentPoint.x;
let intersectionX;
if (startY === endY) {
// 水平线段，取任意一个x坐标
intersectionX = startX;
} else {
// 计算交点的x坐标
const t = (cigaretteY - startY) / (endY - startY);
intersectionX = startX + t * (endX - startX);
}
console.log("交点x坐标:", intersectionX);
// 检查交点是否在香烟线段的x范围内
if (intersectionX >= cigaretteStartX && intersectionX <= cigaretteEndX) {
console.log("轨迹与香烟线段相交!");
return true;
}
}
console.log("轨迹未与香烟线段相交");
return false;
}
separateCigarette() {
console.log("开始分离香烟");
this.isSeparated = true;
this.setTouchEnable(false);
// 设置A的旋转锚点为尾巴连接处（B的左边缘）
const pivotX = this.B.x - this.A.x; // 相对于A的x偏移
const pivotY = this.A.height / 2; // A的中心高度
this.A.pivot.set(pivotX, pivotY);
// 调整A的位置以补偿pivot的变化
this.A.x += pivotX;
this.A.y += pivotY;
// A向下旋转90度并向下移动
Tween.get(this.A)
.to({
angle: -45, // 顺时针旋转90度
y: this.A.y + 60 // 向下移动60像素
}, 666, Ease.quadInOut)
.call(() => {
// 分离完成后，清除轨迹并显示通关
this.clearTrail();
setTimeout(() => {
this.triggerSuccess();
}, 500);
});
// B保持不动，不需要动画
}
clearTrail() {
console.log("清除轨迹动画");
Tween.get(this.trailGraphics)
.to({ alpha: 0 }, 222, Ease.quadInOut)
.call(() => {
this.trailGraphics.clear();
this.trailGraphics.alpha = 1;
console.log("轨迹已清除");
});
}
triggerSuccess() {
console.log("开始通关动画");
const rightX = this.B.x + this.B.width - this.right.width + 20;
const rightY = this.B.y + this.B.height - this.right.height + 20;
// 设置right的位置
this.right.position.set(rightX, rightY);
// 显示right图标并完成通关
Tween.get(this.right)
.to({ alpha: 1 }, 444, Ease.quadInOut)
.wait(2000)
.call(() => {
globalEvent.emit(GameEvent.NextLevel);
});
}
onDestroy() {
super.onDestroy();
// 移除动画
Tween.removeTweens(this.A);
Tween.removeTweens(this.B);
Tween.removeTweens(this.right);
Tween.removeTweens(this.trailGraphics);
// 移除事件监听
const app = getApp();
app.stage.off("pointerdown", this.onPointerDown, this);
app.stage.off("globalpointermove", this.onPointerMove, this);
app.stage.off("pointerup", this.onPointerUp, this);
app.stage.off("pointerupoutside", this.onPointerUp, this);
}
}
src/pages/GamePage/Level/Level13.ts
View file @ 634b4bb2
......@@ -29,7 +29,7 @@ export class Level13 extends LevelBase {
this.A = this.addChild(new Sprite(Assets.get(`level${this.level}/A.png`)));
this.A.position.set(161, 1086);
this.right = this.addChild(new Sprite(Assets.get(`level${this.level}/right.png`)));
this.right = this.addChild(new Sprite(Assets.get(`common/right.png`)));
this.right.position.set(255, 916);
this.right.alpha = 0;
this.right.interactive = false;
......
src/pages/GamePage/Level/Level14.ts
View file @ 634b4bb2
......@@ -31,7 +31,7 @@ export class Level14 extends LevelBase {
this.right.interactive = false;
this.right.eventMode = "none";
this.error = this.addChild(new Sprite(Assets.get(`level${this.level}/error.png`)));
this.error = this.addChild(new Sprite(Assets.get(`common/error.png`)));
this.error.visible = false;
this.error.interactive = false;
......
src/pages/GamePage/Level/Level15.ts
View file @ 634b4bb2
......@@ -50,7 +50,7 @@ export class Level15 extends LevelBase {
this.right.interactive = false;
this.right.eventMode = "none";
this.error = this.addChild(new Sprite(Assets.get(`level${this.level}/error.png`)));
this.error = this.addChild(new Sprite(Assets.get(`common/error.png`)));
this.error.interactive = false;
this.error.eventMode = "none";
......
src/pages/GamePage/Level/Level16.ts
View file @ 634b4bb2
......@@ -58,8 +58,6 @@ export class Level16 extends LevelBase {
const ny = y - this.pos.y;
this.A.position.set(nx, ny);
console.error("123", nx, ny)
if (
nx >= 0
&& nx <= 228
......
src/pages/GamePage/Level/Level18.ts
View file @ 634b4bb2
......@@ -32,7 +32,7 @@ export class Level18 extends LevelBase {
this.ice2 = this.addChild(new Sprite(Assets.get(`level18/ice2.png`)));
this.ice2.position.set(148, 1100);
this.right = this.addChild(new Sprite(Assets.get(`level18/right.png`)));
this.right = this.addChild(new Sprite(Assets.get(`common/right.png`)));
this.right.position.set(433, 1173);
this.right.alpha = 0;
this.right.interactive = false;
......
src/pages/GamePage/Level/Level19.ts
View file @ 634b4bb2
......@@ -29,7 +29,7 @@ export class Level19 extends LevelBase {
this.A.position.set(430, 1100);
this.A.scale.set(0.5948827292110874);
this.right = this.addChild(new Sprite(Assets.get(`level${this.level}/right.png`)));
this.right = this.addChild(new Sprite(Assets.get(`common/right.png`)));
this.right.position.set(613, 1104);
this.right.alpha = 0;
this.right.interactive = false;
......
src/pages/GamePage/Level/Level20.ts
View file @ 634b4bb2
......@@ -35,7 +35,7 @@ export class Level20 extends LevelBase {
top.interactive = false;
top.eventMode = "none";
this.right = this.addChild(new Sprite(Assets.get(`level${this.level}/right.png`)));
this.right = this.addChild(new Sprite(Assets.get(`common/right.png`)));
this.right.position.set(503, 1146);
this.right.alpha = 0;
this.right.interactive = false;
......
src/pages/GamePage/Level/Level22.ts
View file @ 634b4bb2
......@@ -29,7 +29,7 @@ export class Level22 extends LevelBase {
x.interactive = false;
x.eventMode = "none";
this.right = this.addChild(new Sprite(Assets.get(`level${this.level}/right.png`)));
this.right = this.addChild(new Sprite(Assets.get(`common/right.png`)));
this.right.position.set(452, 1242);
this.right.alpha = 0;
this.right.interactive = false;
......
src/pages/GamePage/Level/Level24.ts 0 → 100644
View file @ 634b4bb2
import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
import { Assets, Sprite } from "pixi.js";
import { Ease, Tween } from "@/core/tween";
import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
export class Level24 extends LevelBase {
level: number = 24;
balls: Sprite[] = [];
right: Sprite;
error: Sprite;
// 拖拽相关属性
private dragData: { ball: Sprite, offset: { x: number, y: number } } | null = null;
onLoad() {
super.onLoad();
// 创建四个球，并添加到balls数组中
const ballA = this.addChild(new Sprite(Assets.get(`level${this.level}/球.png`)));
ballA.position.set(125, 710);
ballA.scale.set(134 / 378);
this.balls.push(ballA);
const ballB = this.addChild(new Sprite(Assets.get(`level${this.level}/球.png`)));
ballB.position.set(434, 685);
ballB.scale.set(182 / 378);
this.balls.push(ballB);
const ballC = this.addChild(new Sprite(Assets.get(`level${this.level}/球.png`)));
ballC.position.set(205, 982);
ballC.scale.set(90 / 378);
this.balls.push(ballC);
const ballD = this.addChild(new Sprite(Assets.get(`level${this.level}/球.png`)));
ballD.position.set(410, 926);
ballD.scale.set(156 / 378);
this.balls.push(ballD);
this.right = this.addChild(new Sprite(Assets.get(`common/right.png`)));
this.right.position.set(613, 1104);
this.right.alpha = 0;
this.right.interactive = false;
this.right.eventMode = "none";
// 为每个球添加拖拽事件
this.balls.forEach((ball) => {
ball.on("pointerdown", this.onBallPointerDown, this);
ball.on("globalpointermove", this.onBallPointerMove, this);
ball.on("pointerup", this.onBallPointerUp, this);
ball.on("pointerupoutside", this.onBallPointerUp, this);
});
}
onBallPointerDown(e) {
const ball = e.currentTarget as Sprite;
console.log("开始拖拽球", ball);
this.dragData = {
ball: ball,
offset: {
x: e.data.global.x - ball.x,
y: e.data.global.y - ball.y
}
};
// 将当前球置于最上层
this.setChildIndex(ball, this.children.length - 1);
}
onBallPointerMove(e) {
if (!this.dragData) return;
// 更新球的位置
this.dragData.ball.x = e.data.global.x - this.dragData.offset.x;
this.dragData.ball.y = e.data.global.y - this.dragData.offset.y;
}
onBallPointerUp(e) {
if (!this.dragData) return;
const draggedBall = this.dragData.ball;
this.dragData = null;
// 检查是否与其他球发生碰撞并合成
this.checkMerge(draggedBall);
}
checkMerge(draggedBall: Sprite) {
for (const ball of this.balls) {
if (ball === draggedBall) continue;
// 计算两球中心点的距离（由于锚点为默认值，需要加上半径偏移）
const draggedCenterX = draggedBall.x + (draggedBall.width / 2);
const draggedCenterY = draggedBall.y + (draggedBall.height / 2);
const ballCenterX = ball.x + (ball.width / 2);
const ballCenterY = ball.y + (ball.height / 2);
const distance = this.getDistance(
{ x: draggedCenterX, y: draggedCenterY },
{ x: ballCenterX, y: ballCenterY }
);
// 计算两球的半径
const draggedRadius = draggedBall.width / 2;
const ballRadius = ball.width / 2;
// 如果两球接触（距离小于两球半径之和）
if (distance < draggedRadius + ballRadius) {
console.log("球碰撞，开始合成");
this.mergeBalls(draggedBall, ball);
return;
}
}
}
mergeBalls(ball1: Sprite, ball2: Sprite) {
// 计算新球的位置（两球中心点的中点，然后转换回左上角坐标）
const ball1CenterX = ball1.x + (ball1.width / 2);
const ball1CenterY = ball1.y + (ball1.height / 2);
const ball2CenterX = ball2.x + (ball2.width / 2);
const ball2CenterY = ball2.y + (ball2.height / 2);
const newCenterX = (ball1CenterX + ball2CenterX) / 2;
const newCenterY = (ball1CenterY + ball2CenterY) / 2;
// 计算新球的大小（使用更小的增长幅度）
const scaleIncrease = Math.min(ball1.scale.x, ball2.scale.x) * 0.4; // 增长幅度减小为较小球的30%
const newScale = Math.min(Math.max(ball1.scale.x, ball2.scale.x) + scaleIncrease, 1.2); // 最大限制调整为1.2
// 移除较小的球，保留较大的球作为合成结果
const keepBall = ball1.scale.x >= ball2.scale.x ? ball1 : ball2;
const removeBall = ball1.scale.x >= ball2.scale.x ? ball2 : ball1;
// 从balls数组中移除被合成的球
const removeIndex = this.balls.indexOf(removeBall);
if (removeIndex > -1) {
this.balls.splice(removeIndex, 1);
}
// 移除被合成的球的事件监听
removeBall.off("pointerdown", this.onBallPointerDown, this);
removeBall.off("globalpointermove", this.onBallPointerMove, this);
removeBall.off("pointerup", this.onBallPointerUp, this);
removeBall.off("pointerupoutside", this.onBallPointerUp, this);
// 计算新位置（左上角坐标）
const newSize = 378 * newScale;
const newX = newCenterX - (newSize / 2);
const newY = newCenterY - (newSize / 2);
// 播放合成动画
Tween.get(keepBall)
.to({ x: newX, y: newY, scaleX: newScale, scaleY: newScale }, 300, Ease.quadOut)
.call(() => {
// 移除被合成的球
this.removeChild(removeBall);
// 检查是否通关
this.checkWinCondition();
});
Tween.get(removeBall)
.to({ alpha: 0, scaleX: 0, scaleY: 0 }, 300, Ease.quadOut);
}
checkWinCondition() {
console.log("检查通关条件，剩余球数:", this.balls.length);
// 如果只剩一个球
if (this.balls.length === 1) {
console.log("达到通关条件");
this.triggerSuccess();
}
}
getDistance(point1: { x: number, y: number }, point2: { x: number, y: number }): number {
const dx = point1.x - point2.x;
const dy = point1.y - point2.y;
return Math.sqrt(dx * dx + dy * dy);
}
triggerSuccess() {
// 防止重复触发
if (this.right.alpha > 0) return;
console.log("开始通关动画");
this.setTouchEnable(false);
// 获取最后一个球
const lastBall = this.balls[0];
// 计算屏幕中间位置（假设屏幕尺寸为720x1280）
const screenCenterX = 360;
const screenCenterY = 940;
// 计算球移动到屏幕中间时的位置（左上角坐标）
const ballTargetX = screenCenterX - (lastBall.width / 2);
const ballTargetY = screenCenterY - (lastBall.height / 2);
// 球移动到屏幕中间的动画
Tween.get(lastBall)
.to({ x: ballTargetX, y: ballTargetY }, 600, Ease.quadInOut)
.call(() => {
// 球到达中间后，计算right的位置（球的右下角）
const rightX = lastBall.x + lastBall.width - this.right.width + 20; // 稍微偏移一点
const rightY = lastBall.y + lastBall.height - this.right.height + 20;
// 设置right的位置
this.right.position.set(rightX, rightY);
// 显示right图标并完成通关
Tween.get(this.right)
.to({ alpha: 1 }, 444, Ease.quadInOut)
.wait(2000)
.call(() => {
globalEvent.emit(GameEvent.NextLevel);
});
});
}
onDestroy() {
super.onDestroy();
// 移除所有球的tween动画
this.balls.forEach(ball => {
Tween.removeTweens(ball);
ball.off("pointerdown", this.onBallPointerDown, this);
ball.off("globalpointermove", this.onBallPointerMove, this);
ball.off("pointerup", this.onBallPointerUp, this);
ball.off("pointerupoutside", this.onBallPointerUp, this);
});
Tween.removeTweens(this.right);
}
}
src/pages/GamePage/Level/Level5.ts
View file @ 634b4bb2
......@@ -35,7 +35,7 @@ export class Level5 extends LevelBase {
this.right.alpha = 0;
this.right.interactive = false;
this.error = this.addChild(new Sprite(Assets.get(`level${this.level}/error.png`)));
this.error = this.addChild(new Sprite(Assets.get(`common/error.png`)));
this.error.visible = false;
this.error.interactive = false;
......
src/pages/GamePage/Level/Level8.ts
View file @ 634b4bb2
......@@ -30,7 +30,7 @@ export class Level8 extends LevelBase {
this.D = this.addChild(new Sprite(Assets.get(`level${this.level}/D.png`)));
this.D.position.set(398, 1002);
this.right = this.addChild(new Sprite(Assets.get(`level${this.level}/right.png`)));
this.right = this.addChild(new Sprite(Assets.get(`common/right.png`)));
this.right.position.set(518, 530);
this.right.visible = false;
this.right.interactive = false;
......
src/pages/GamePage/Level/Level9.ts
View file @ 634b4bb2
......@@ -21,7 +21,7 @@ export class Level9 extends LevelBase {
this.A = this.addChild(new Sprite(Assets.get(`level${this.level}/duck.png`)));
this.A.position.set(330, 764);
this.right = this.addChild(new Sprite(Assets.get(`level${this.level}/right.png`)));
this.right = this.addChild(new Sprite(Assets.get(`common/right.png`)));
this.right.position.set(470, 1050);
this.right.alpha = 0;
this.right.interactive = false;
......
src/pages/GamePage/Level/LevelConfig.ts
View file @ 634b4bb2
......@@ -9,6 +9,7 @@ import { Level8 } from "@/pages/GamePage/Level/Level8.ts";
import { Level9 } from "@/pages/GamePage/Level/Level9.ts";
import { Level10 } from "@/pages/GamePage/Level/Level10.ts";
import { Level11 } from "@/pages/GamePage/Level/Level11.ts";
import { Level12 } from "@/pages/GamePage/Level/Level12.ts";
import { Level13 } from "@/pages/GamePage/Level/Level13.ts";
import { Level14 } from "@/pages/GamePage/Level/Level14.ts";
import { Level15 } from "@/pages/GamePage/Level/Level15.ts";
......@@ -18,6 +19,7 @@ import { Level20 } from "@/pages/GamePage/Level/Level20.ts";
import { Level21 } from "@/pages/GamePage/Level/Level21.ts";
import { Level22 } from "@/pages/GamePage/Level/Level22.ts";
import { Level23 } from "@/pages/GamePage/Level/Level23.ts";
import { Level24 } from "@/pages/GamePage/Level/Level24.ts";
export const LevelArr = [
......@@ -32,7 +34,7 @@ export const LevelArr = [
{ cls: Level9, tip: `移动小鸭子至河边` },
{ cls: Level10, tip: `将“1”移动至等号右边<br/>形成等式` },
{ cls: Level11, tip: `将冰箱放大至能装够装下<br/>长颈鹿` },
{ cls: Level9, tip: `掐断烟头` }, // 12
{ cls: Level12, tip: `掐断烟头` },
{ cls: Level13, tip: `打开盖子看看` },
{ cls: Level14, tip: `将香蕉移动到牛奶中<br/>变成香蕉牛奶` },
{ cls: Level15, tip: `猫吃老鼠` },
......@@ -44,6 +46,6 @@ export const LevelArr = [
{ cls: Level21, tip: `移动鸡蛋，碰一碰便知` },
{ cls: Level22, tip: `移开圣诞老人的衣服看看` },
{ cls: Level23, tip: `一样重` },
{ cls: Level23, tip: `将雪球合在一起滚成大雪球` }, // 24
{ cls: Level24, tip: `将雪球合在一起滚成大雪球` },
{ cls: Level23, tip: `按住小猪鼻子，把它憋醒` }, // 25
];
src/pages/HomePage/HomePage.less
View file @ 634b4bb2
......@@ -103,14 +103,16 @@
.sparkBg("homePage/answer.png");
}
.remain {
width: 125px;
height: 21px;
left: 161px;
width: 422px;
height: 24px;
// left: 161px;
top: 94px;
text-align: center;
position: absolute;
font-size: 21px;
line-height: 21px;
line-height: 24px;
color: rgba(170, 64, 0, 1);
.lineClamp1();
}
}
.rank {
......@@ -128,14 +130,15 @@
.sparkBg("homePage/r_bg.png");
}
.name {
width: 233px;
height: 29px;
width: 300px;
height: 33px;
left: 145px;
top: 67px;
position: absolute;
font-size: 30px;
line-height: 29px;
line-height: 33px;
color: rgba(30, 76, 169, 1);
.lineClamp1();
}
.head {
width: 95px;
......@@ -143,7 +146,8 @@
left: 37px;
top: 34px;
position: absolute;
.sparkBg("homePage/head.png");
// .sparkBg("homePage/head.png");
border-radius: 15px;
}
.myrank {
width: 104px;
......@@ -154,14 +158,16 @@
.sparkBg("homePage/myRank.png");
}
.number {
width: 125px;
height: 52px;
left: 469px;
top: 39px;
width: 180px;
height: 70px;
left: 439px;
top: 32px;
text-align: center;
position: absolute;
font-size: 68px;
line-height: 52px;
font-size: 60px;
line-height: 70px;
color: rgba(30, 76, 169, 1);
.lineClamp1();
}
}
.prize {
......@@ -204,4 +210,12 @@
position: absolute;
.sparkBg("homePage/logo.png");
}
.musicBtn {
position: absolute;
left: 20px;
top: 590px;
width: 47px;
height: 47px;
}
}
\ No newline at end of file
src/pages/HomePage/HomePage.tsx
View file @ 634b4bb2
......@@ -9,6 +9,7 @@ import { PageCtrl } from "@/core/ctrls/PageCtrl";
import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
import Rulepop from "../../components/rulepop/rulepop.jsx";
import CapsulePage from "../CapsulePage/CapsulePage.jsx";
import { isWeiXin } from "../../AppTools.ts";
import store from '@/store/store';
import Taskpop from '@/panels/taskpop/taskpop.jsx';
import Yinsirulepop from '@/panels/yinsirulepop/yinsirulepop.jsx';
......@@ -19,8 +20,7 @@ import { LOG_KEY, MatterShareOpt, MatterViewDuration, MatterViewOpt, pageView, s
import { CHANNEL_PARAMS, extranceName } from '@/utils/constants.js';
import gameStore from "@/store/gameStore.ts";
import GamePage from "@/pages/GamePage/GamePage.tsx";
import Settlechance from "../../components/settlechance/settlechance.jsx"
import MusicBtn from '@/core/components/MusicBtn/MusicBtn.tsx';
@observer
class Homepage extends React.Component {
......@@ -31,6 +31,9 @@ class Homepage extends React.Component {
}
async componentDidMount() {
if (isWeiXin()) {
if (!await store.checkBindStatus()) return;
}
await store.updateIndex();
await shareStore.doAssist();
this.initSensor();
......@@ -102,7 +105,7 @@ class Homepage extends React.Component {
} else {
PageCtrl.changePage(MyPrize);
}
break;
// 5 活动规则
......@@ -111,7 +114,7 @@ class Homepage extends React.Component {
page_name: "活动首页",
button_name: "规则按钮",
});
ModalCtrl.showModal(Settlechance);
ModalCtrl.showModal(Rulepop);
break;
// 6 拜访清单
......@@ -188,6 +191,7 @@ class Homepage extends React.Component {
});
};
render() {
const { uid, avatar, rank, answerChance } = store?.indexData || {}
return (
<div className="homepage">
<span className="bg"></span>
......@@ -197,13 +201,16 @@ class Homepage extends React.Component {
<span className="brain"></span>
<span className="wenhao"></span>
<span className="title"></span>
{/* 按钮 共7个 */}
{/* 按钮 */}
<div className="rank">
<span className="r_bg"></span>
<span className="name">用户uid:132802</span>
<span className="head"></span>
<span className="name">用户UID:{uid}</span>
<img className="head"
src={avatar}
alt=''
/>
<Button className="myrank" onClick={() => this.handleButtonClick(0)} />
<span className="number">000</span>
<span className="number">{rank === null ? '未参与' : rank === -1 ? '未上榜' : rank}</span>
</div>
<span className="logo"></span>
<Button className="draw" onClick={() => this.handleButtonClick(1)} />
......@@ -211,12 +218,14 @@ class Homepage extends React.Component {
<Button className="matter" onClick={() => this.handleButtonClick(3)}>
<span className="m_bg"></span>
<span className="answer"></span>
<span className="remain">剩余次数：3</span>
<span className="remain">剩余次数：{answerChance}</span>
</Button>
<Button className="prize" onClick={() => this.handleButtonClick(4)} />
<Button className="rule" onClick={() => this.handleButtonClick(5)} />
<Button className="visit" onClick={() => this.handleButtonClick(6)} />
<Button className="share" onClick={() => this.handleButtonClick(7)} />
<MusicBtn className="musicBtn" />
</div>
);
}
......
src/store/share.js
View file @ 634b4bb2
......@@ -218,7 +218,7 @@ const shareStore = makeAutoObservable({
CFG.projectId == "pafc25ff1"
? "https://lifeapp.picclife.cn/portal/app_manager/downloadapps.html?operate_link=" +
encodeURIComponent(
`https://lifeapp-api.picclife.cn/lifeapi/lifeapp-svc-gw/api/auth_code/authorize/v1?activity_code=612702&redirect_type=0&redirect_uri=${isIos()
`https://lifeapp-api.picclife.cn/lifeapi/lifeapp-svc-gw/api/auth_code/authorize/v1?activity_code=613402&redirect_type=0&redirect_uri=${isIos()
? encodeURIComponent(
encodeURIComponent(
`https://96094-activity.dexfu.cn/customShare/share?id=${prodCustomId}` +
......@@ -236,7 +236,7 @@ const shareStore = makeAutoObservable({
"&isBindManager=1&isNeedAuth=1&operate_type=3"
: "https://lifeapp-test.picclife.cn/portal-web/app_manager/downloadapps.html?operate_link=" +
encodeURIComponent(
`https://lifeapp-api-test.picclife.cn/lifeapi/lifeapp-svc-rel-gw/api/auth_code/authorize/v1?activity_code=612702&redirect_type=0&redirect_uri=${isIos()
`https://lifeapp-api-test.picclife.cn/lifeapi/lifeapp-svc-rel-gw/api/auth_code/authorize/v1?activity_code=613402&redirect_type=0&redirect_uri=${isIos()
? encodeURIComponent(
encodeURIComponent(
`https://96094-activity.dexfu.cn/customShare/share?id=${testCustomId}` +
......
src/store/store.ts
View file @ 634b4bb2
......@@ -2,7 +2,7 @@ import { makeAutoObservable, } from 'mobx';
import API from '../api/index';
import { Toast } from "@grace/ui";
import { initWx, IWxShareInfo } from "@/built-in/share/weixin/weixin.ts";
import { _asyncThrottle, _debounce, getUrlParam } from '@/utils/utils';
import { _asyncThrottle, _debounce, getUrlParam, waitTime } from '@/utils/utils';
// import { IBubbleInfo } from "@/pages/HomePage/Top/Components/Bubble.ts";
// import { IOverflowBubbleInfo } from "@/pages/HomePage/Top/Components/OverflowBubble.ts";
import { getDomain } from '@spark/dbdomain';
......@@ -10,6 +10,8 @@ import { showShareGuide } from '@spark/share';
import { ModalCtrl } from '@/core/ctrls/ModalCtrl';
import RankPrizePop from '@/panels/RankPrizePop/RankPrizePop';
import RankNoPrizePop from '@/panels/RankNoPrizePop/RankNoPrizePop';
import RulePop from "../components/rulepop/rulepop.jsx";
import LoginPop from "../components/loginpop/loginpop.jsx"
class Store {
......@@ -24,12 +26,12 @@ class Store {
shareInfo: any,
ruleImg?: string,
} = {
shareInfo: {
title: "",
desc: "",
imgUrl: "",
},
};
shareInfo: {
title: "",
desc: "",
imgUrl: "",
},
};
ruleInfo = '';
......@@ -51,44 +53,57 @@ class Store {
console.log('前端开发配置', data)
}
/** 绑定手机号接口返回状态 */
isApiCheckBack: false
setIsApiCheckBack(status) {
this.isApiCheckBack = status;
}
/** 校验是否绑定手机号 */
async checkBindStatus() {
const { success, data } = await API.checkBind({
appId: getUrlParam("appId"),
dbredirect: encodeURIComponent(window.location.href),
});
console.info("%c data", "font-size: 30px", data);
if (success && data) {
if (data?.bind) {
if (data?.url) {
location.replace(data?.url);
} else {
// 已经绑定过，跳转完后端返回的免登链接时，展示页面
this.setIsApiCheckBack(true); // 助力
return true;
}
} else {
this.setIsApiCheckBack(true);
ModalCtrl.showModal(LoginPop);
}
await waitTime(200);
}
return false;
}
indexData: {
actStartTime?: number,
actEndTime?: number,
currentTime?: number,
guideFlag?: boolean,
creditsNum?: number,
expireDays?: number,
currentStoreNum?: number,
storeLimitNum?: number,
continueSignDays?: number,
todaySignFlag?: boolean,
signRecords?: {
id: string,
day: number,
creditsNum: number,
boolSign: boolean,
}[],
// overflowBubble?: IOverflowBubbleInfo,
// bubbleRecords?: IBubbleInfo[],
returnAwardCreditsNum?: number,
downGoldVo?: {
creditsNum: number,
multipleValue: number,
taskId: string,
url: string,
actStartTime?: number, // 对应mock中的actStartTimestamp
actEndTime?: number, // 对应mock中的actEndTimestamp
currentTime?: number, // 对应mock中的currentTimestamp
answerChance?: number,
rank?: number,
uid?: string,
avatar?: string,
isAgent?: boolean,
agreePrivacy?: boolean,
boundYkCode?: string,
validUid?: boolean,
rulePop?: boolean,
rankPop?: {
prizeName?: string | null,
prizeImg?: string,
rank?: number
},
isAgent:string,
agreePrivacy:boolean,
} = {
isAgent: '',
agreePrivacy: false
};
} = {};
firstIn = true;
async updateIndex() {
const { success, data } = await API.index();
......@@ -113,19 +128,23 @@ class Store {
}
}
if(this.firstIn && data.validUid){
if (this.firstIn && data.validUid) {
API.visit()
this.firstIn = false
}
if(data?.rankPop){
if(data?.rankPop?.prizeName){
ModalCtrl.showModal(RankPrizePop,{
prize:data?.rankPop
if (data.rulePop) {
ModalCtrl.showModal(RulePop)
}
if (data?.rankPop) {
if (data?.rankPop?.prizeName) {
ModalCtrl.showModal(RankPrizePop, {
prize: data?.rankPop
})
}else{
ModalCtrl.showModal(RankNoPrizePop,{
prize:data?.rankPop
} else {
ModalCtrl.showModal(RankNoPrizePop, {
prize: data?.rankPop
})
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment