Commit 6b53a03a authored by 徐士卿's avatar 徐士卿

Merge branch 'master' of gitlab2.dui88.com:sparkprojects/kww_daydaygetcredits_250512

parents 17352cb9 8521e54f
......@@ -45,7 +45,7 @@
CFG.loginMidId = "Did1NjAwMDc"; // 线上正式
if (location.href.indexOf("duibatest") > -1) {
CFG.loginMidId = "Did1MTM2NTU"; // 测试
} else if (CFG.projectId == 'p555448e6') { // TODO 线上测试id
} else if (CFG.projectId == 'p69bb35bf') { // TODO 线上测试id
CFG.loginMidId = "Did1NTk5OTk"; // 线上测试
}
// 免登中间页
......@@ -66,6 +66,7 @@
<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/1747793239670/assets/polyfills-legacy-arANKBzQ.js"></script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1747793239670/assets/index-legacy-DrfPtArY.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
......
......@@ -30,8 +30,8 @@ export default [
}),
overflowBubble: {
creditsNum: 700,
expireTime: 1746669495352,
id: 218090705,
expireTime: 1747819895773,
id: 218093371,
},
bubbleRecords: new Array(1 + (Math.random() * 4 >> 0)).fill(1).map((_, index) => {
return {
......
src/assets/Game/撒金币.gif

1.49 MB | W: | H:

src/assets/Game/撒金币.gif

239 KB | W: | H:

src/assets/Game/撒金币.gif
src/assets/Game/撒金币.gif
src/assets/Game/撒金币.gif
src/assets/Game/撒金币.gif
  • 2-up
  • Swipe
  • Onion skin
......@@ -29,12 +29,13 @@ export class BubbleMgr extends Base {
if (!bubbleRecords?.length) return;
const bubbles = bubbleRecords.slice(0, 4);
const newBubbleKeys = [];
bubbleRecords.forEach((info) => newBubbleKeys.push(info.id));
bubbles.forEach((info) => newBubbleKeys.push(info.id));
// 找到bubbleArr中不在newBubbleKeys中的bubble
this.bubbleArr.forEach((bubble, i) => {
if (i >= 4) return;
if (bubble && !newBubbleKeys.includes(bubble.id)) {
bubble.destroy();
this.bubbleArr[i] = null;
......@@ -43,7 +44,7 @@ export class BubbleMgr extends Base {
});
// 更新数据
bubbleRecords.forEach((info, index) => {
bubbles.forEach((info, index) => {
const { id } = info;
let bubble = this.bubbleMap.get(id);
......
......@@ -80,6 +80,7 @@ export class OverflowBubble extends Container implements IBase {
@reactor(() => store.indexData.overflowBubble)
updateOverflow(info: IOverflowBubbleInfo) {
if (!info) {
this.visible = false;
Tween.removeTweens(this.cdTarget);
......@@ -87,7 +88,8 @@ export class OverflowBubble extends Container implements IBase {
}
const { id, creditsNum, expireTime } = info;
if (expireTime - Date.now()) {
if (expireTime - Date.now() <= 0) {
this.visible = false;
Tween.removeTweens(this.cdTarget);
return;
......
......@@ -20,8 +20,8 @@ export class Game extends Base {
const bg = this.addChild(new Sprite(Assets.get("招财猫_底.png")));
bg.position.set(168, 332);
const fullTextures = new Array(150).fill(0).map((_, i) => {
return Assets.get(`落金币/落金币1_${prefixInteger(i * 2, 5)}.png`);
const fullTextures = new Array(99).fill(0).map((_, i) => {
return Assets.get(`落金币/落金币1_${prefixInteger(i, 5)}.png`);
});
const fullAni = this.fullAni = this.addChild(new AnimatedSprite(fullTextures));
......
......@@ -66,7 +66,9 @@ class GuidePanel extends React.Component<IGuidePanelProps> {
<Button className={styles.guide6Btn} onClick={this.clickGuide6Btn}/>
</>
: <div className={styles.tip}>点击屏幕继续</div>
: <div className={classNames(styles.tip)} style={{
top: step == 2 && 700 * remScale,
}}>点击屏幕继续</div>
}
</div>;
......
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