Commit 1d2a9126 authored by haiyoucuv's avatar haiyoucuv

上传

parent 9efc4adc
...@@ -2131,7 +2131,7 @@ ...@@ -2131,7 +2131,7 @@
"__id__": 72 "__id__": 72
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 101
...@@ -2770,7 +2770,7 @@ ...@@ -2770,7 +2770,7 @@
"__id__": 109 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 137 "__id__": 137
......
...@@ -47,7 +47,7 @@ export default class PrizePanel extends Panel { ...@@ -47,7 +47,7 @@ export default class PrizePanel extends Panel {
this.highestLabel.string = highest; this.highestLabel.string = highest;
this.scoreLabel.string = score; this.scoreLabel.string = score;
this.prizeName.string = strFormat(optionName, 20); this.prizeName.string = optionName;
this.img.spriteFrame = optionImg; this.img.spriteFrame = optionImg;
} }
......
...@@ -12,6 +12,7 @@ const {ccclass, property} = _decorator; ...@@ -12,6 +12,7 @@ const {ccclass, property} = _decorator;
import { YXCollectionView, YXFlowLayout, YXIndexPath } from "../../Component/YXList/lib"; import { YXCollectionView, YXFlowLayout, YXIndexPath } from "../../Component/YXList/lib";
import { sendWebNet, WebNetName } from "../Utils/WebNet/WebNet"; import { sendWebNet, WebNetName } from "../Utils/WebNet/WebNet";
import { popWindow } from "../AppTool"; import { popWindow } from "../AppTool";
import { hidePanel, hideWaiting, showWaiting } from "../../Module/UIFast";
enum TAB { enum TAB {
...@@ -93,8 +94,15 @@ export default class RankPanel extends Panel { ...@@ -93,8 +94,15 @@ export default class RankPanel extends Panel {
this.monthlyList.layout = monthlyLayout; this.monthlyList.layout = monthlyLayout;
this.monthlyList.reloadData(); this.monthlyList.reloadData();
await this.updateDaily();
await this.updateMonthly(); showWaiting(true);
await Promise.all([
this.updateDaily(),
this.updateMonthly(),
]);
hideWaiting();
// await this.updateDaily();
// await this.updateMonthly();
} }
clickDaily() { clickDaily() {
......
...@@ -224,7 +224,7 @@ export function sendWebNetWithToken( ...@@ -224,7 +224,7 @@ export function sendWebNetWithToken(
try { try {
const token = await getPxTokenSave(); const token = await getPxTokenSave();
if (!token) { if (!token) {
showToast('网络异常,请稍后重试'); showToast('Network error, please try again later.');
r({success: false}) r({success: false})
return; return;
} }
......
...@@ -20,7 +20,7 @@ import { getUrlParams } from "../Scripts/Utils/WebNet/web/webTools"; ...@@ -20,7 +20,7 @@ import { getUrlParams } from "../Scripts/Utils/WebNet/web/webTools";
import store from "../Scripts/store/store"; import store from "../Scripts/store/store";
import { AudioMgr } from "../core_tgx/base/AudioMgr"; import { AudioMgr } from "../core_tgx/base/AudioMgr";
import { MusicBtn } from "../Component/MusicBtn/MusicBtn"; import { MusicBtn } from "../Component/MusicBtn/MusicBtn";
import { gameId } from "../Scripts/AppTool"; import { gameId, popWindow } from "../Scripts/AppTool";
const {ccclass, property} = _decorator; const {ccclass, property} = _decorator;
...@@ -94,6 +94,9 @@ export class Start extends Component { ...@@ -94,6 +94,9 @@ export class Start extends Component {
if (!success) { if (!success) {
showToast("Authorization failure"); showToast("Authorization failure");
this.scheduleOnce(() => {
popWindow();
}, 2);
return; return;
} }
...@@ -182,7 +185,7 @@ export class Start extends Component { ...@@ -182,7 +185,7 @@ export class Start extends Component {
async (error) => { async (error) => {
if (error) { if (error) {
console.error(error); console.error(error);
showToast("活动太火爆啦,请稍后再试~"); showToast("Network error, please try again later.");
} }
// onComplete(); // onComplete();
resolve(); resolve();
......
...@@ -1310,7 +1310,7 @@ ...@@ -1310,7 +1310,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 750.0000000000001, "width": 750,
"height": 1624 "height": 1624
}, },
"_anchorPoint": { "_anchorPoint": {
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
"bucket": "sbx-gamification-tngd", "bucket": "sbx-gamification-tngd",
"accessKeyId": "LTAI5tApBGwYWaj6zLmKUaTJ", "accessKeyId": "LTAI5tApBGwYWaj6zLmKUaTJ",
"accessKeySecret": "W3OvCDpbE3ywMaQnTNWzySnhPRK1We", "accessKeySecret": "W3OvCDpbE3ywMaQnTNWzySnhPRK1We",
"cdnDomain": "//gamification-sbx.tngdigital.com.my" "cdnDomain": "//gamification-cdn-sbx.tngdigital.com.my"
} }
}, },
"__version__": "1.3.8", "__version__": "1.3.8",
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
"bucket": "sbx-gamification-tngd", "bucket": "sbx-gamification-tngd",
"accessKeyId": "LTAI5tApBGwYWaj6zLmKUaTJ", "accessKeyId": "LTAI5tApBGwYWaj6zLmKUaTJ",
"accessKeySecret": "W3OvCDpbE3ywMaQnTNWzySnhPRK1We", "accessKeySecret": "W3OvCDpbE3ywMaQnTNWzySnhPRK1We",
"cdnDomain": "//gamification-sbx.tngdigital.com.my" "cdnDomain": "//gamification-cdn-sbx.tngdigital.com.my"
} }
} }
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"config": { "config": {
"images": [], "images": [],
"sceneUUID": {}, "sceneUUID": {},
"scene": "04224ebd-adcd-4112-8010-da14ed5ea48a" "scene": "063b0464-e893-46fd-95f9-73a41f19fd25"
}, },
"show": false "show": false
} }
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