Skip to content

Q
qiaqia_qx
Commit 1ba639a1 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1111

parent f0c5a869
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 37 deletions
.idea/workspace.xml
View file @ 1ba639a1
......@@ -2,15 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="31be0130-d27d-4740-b668-956a8050e1bf" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/resource/exRecordPanel/record_cant.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/released/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/released/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/ExRecordPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/ExRecordPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/parts/Game/Plant.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/Plant.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/parts/Game/ProgressBar.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/Game/ProgressBar.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/parts/UI/UILayer.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/parts/UI/UILayer.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scenes/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scenes/LoadingScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/utils.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -71,7 +66,7 @@
<recent name="$PROJECT_DIR$/resource/taskPanel" />
</key>
</component>
<component name="RunManager" selected="npm.build">
<component name="RunManager" selected="npm.buildTS">
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
......@@ -120,9 +115,9 @@
</list>
<recent_temporary>
<list>
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.dev" />
</list>
</recent_temporary>
......@@ -158,7 +153,8 @@
<workItem from="1592202867636" duration="167000" />
<workItem from="1592203763793" duration="21589000" />
<workItem from="1592273018019" duration="24906000" />
<workItem from="1592358392926" duration="13956000" />
<workItem from="1592358392926" duration="17069000" />
<workItem from="1592445169349" duration="2681000" />
</task>
<task id="LOCAL-00001" summary="1">
<created>1591003912929</created>
......@@ -475,7 +471,14 @@
<option name="project" value="LOCAL" />
<updated>1592373726127</updated>
</task>
<option name="localTasksCounter" value="46" />
<task id="LOCAL-00046" summary="1111">
<created>1592385430032</created>
<option name="number" value="00046" />
<option name="presentableId" value="LOCAL-00046" />
<option name="project" value="LOCAL" />
<updated>1592385430032</updated>
</task>
<option name="localTasksCounter" value="47" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -532,8 +535,8 @@
</state>
<state x="671" y="259" key="#com.intellij.ide.util.MemberChooser/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591344864454" />
<state x="764" y="293" key="#com.intellij.ide.util.MemberChooser/37.23.1883.1177@37.23.1883.1177" timestamp="1591929411133" />
<state x="540" y="230" key="CommitChangelistDialog2" timestamp="1592373725900">
<screen x="35" y="23" width="1885" height="1177" />
<state x="529" y="120" key="CommitChangelistDialog2" timestamp="1592385429485">
<screen x="37" y="23" width="1883" height="1177" />
</state>
<state x="502" y="120" key="CommitChangelistDialog2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884607456" />
<state x="411" y="44" key="CommitChangelistDialog2/35.23.1405.877@35.23.1405.877" timestamp="1592293157840" />
......@@ -543,14 +546,15 @@
<state x="2182" y="-102" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189619717" />
<state x="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591846770902" />
<state x="467" y="108" key="CommitChangelistDialog2/37.23.1643.1027@37.23.1643.1027" timestamp="1591785684954" />
<state x="529" y="120" key="CommitChangelistDialog2/37.23.1883.1177@37.23.1883.1177" timestamp="1591931899805" />
<state width="930" height="191" key="GridCell.Tab.0.bottom" timestamp="1592385235055">
<screen x="37" y="23" width="1883" height="1177" />
<state x="529" y="120" key="CommitChangelistDialog2/37.23.1883.1177@37.23.1883.1177" timestamp="1592385429485" />
<state width="930" height="191" key="GridCell.Tab.0.bottom" timestamp="1592449034591">
<screen x="32" y="23" width="1888" height="1177" />
</state>
<state width="1601" height="346" key="GridCell.Tab.0.bottom/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="930" height="191" key="GridCell.Tab.0.bottom/32.23.1888.1177@32.23.1888.1177" timestamp="1592449034591" />
<state width="1363" height="191" key="GridCell.Tab.0.bottom/35.23.1405.877@35.23.1405.877" timestamp="1592296979551" />
<state width="499" height="907" key="GridCell.Tab.0.bottom/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" />
<state width="826" height="191" key="GridCell.Tab.0.bottom/35.23.1885.1177@35.23.1885.1177" timestamp="1592375232702" />
<state width="930" height="191" key="GridCell.Tab.0.bottom/35.23.1885.1177@35.23.1885.1177" timestamp="1592393512540" />
<state width="1602" height="270" key="GridCell.Tab.0.bottom/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534759" />
<state width="1842" height="270" key="GridCell.Tab.0.bottom/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213327" />
<state width="252" height="1057" key="GridCell.Tab.0.bottom/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408198" />
......@@ -558,13 +562,14 @@
<state width="252" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525606" />
<state width="311" height="907" key="GridCell.Tab.0.bottom/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871414" />
<state width="930" height="191" key="GridCell.Tab.0.bottom/37.23.1883.1177@37.23.1883.1177" timestamp="1592385235055" />
<state width="930" height="191" key="GridCell.Tab.0.center" timestamp="1592385235054">
<screen x="37" y="23" width="1883" height="1177" />
<state width="930" height="191" key="GridCell.Tab.0.center" timestamp="1592449034588">
<screen x="32" y="23" width="1888" height="1177" />
</state>
<state width="1601" height="346" key="GridCell.Tab.0.center/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="930" height="191" key="GridCell.Tab.0.center/32.23.1888.1177@32.23.1888.1177" timestamp="1592449034588" />
<state width="1363" height="191" key="GridCell.Tab.0.center/35.23.1405.877@35.23.1405.877" timestamp="1592296979547" />
<state width="499" height="907" key="GridCell.Tab.0.center/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953116" />
<state width="826" height="191" key="GridCell.Tab.0.center/35.23.1885.1177@35.23.1885.1177" timestamp="1592375232702" />
<state width="930" height="191" key="GridCell.Tab.0.center/35.23.1885.1177@35.23.1885.1177" timestamp="1592393512539" />
<state width="1602" height="270" key="GridCell.Tab.0.center/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534759" />
<state width="1842" height="270" key="GridCell.Tab.0.center/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213327" />
<state width="252" height="1057" key="GridCell.Tab.0.center/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408196" />
......@@ -572,13 +577,14 @@
<state width="252" height="907" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525596" />
<state width="311" height="907" key="GridCell.Tab.0.center/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871413" />
<state width="930" height="191" key="GridCell.Tab.0.center/37.23.1883.1177@37.23.1883.1177" timestamp="1592385235054" />
<state width="930" height="191" key="GridCell.Tab.0.left" timestamp="1592385235054">
<screen x="37" y="23" width="1883" height="1177" />
<state width="930" height="191" key="GridCell.Tab.0.left" timestamp="1592449034587">
<screen x="32" y="23" width="1888" height="1177" />
</state>
<state width="1601" height="346" key="GridCell.Tab.0.left/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614403" />
<state width="930" height="191" key="GridCell.Tab.0.left/32.23.1888.1177@32.23.1888.1177" timestamp="1592449034587" />
<state width="1363" height="191" key="GridCell.Tab.0.left/35.23.1405.877@35.23.1405.877" timestamp="1592296979544" />
<state width="499" height="907" key="GridCell.Tab.0.left/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953114" />
<state width="826" height="191" key="GridCell.Tab.0.left/35.23.1885.1177@35.23.1885.1177" timestamp="1592375232702" />
<state width="930" height="191" key="GridCell.Tab.0.left/35.23.1885.1177@35.23.1885.1177" timestamp="1592393512538" />
<state width="1602" height="270" key="GridCell.Tab.0.left/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534758" />
<state width="1842" height="270" key="GridCell.Tab.0.left/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213326" />
<state width="252" height="1057" key="GridCell.Tab.0.left/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408195" />
......@@ -586,13 +592,14 @@
<state width="252" height="907" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591852525590" />
<state width="311" height="907" key="GridCell.Tab.0.left/37.23.1643.1027@37.23.1643.1027" timestamp="1591713871412" />
<state width="930" height="191" key="GridCell.Tab.0.left/37.23.1883.1177@37.23.1883.1177" timestamp="1592385235054" />
<state width="930" height="191" key="GridCell.Tab.0.right" timestamp="1592385235054">
<screen x="37" y="23" width="1883" height="1177" />
<state width="930" height="191" key="GridCell.Tab.0.right" timestamp="1592449034589">
<screen x="32" y="23" width="1888" height="1177" />
</state>
<state width="1601" height="346" key="GridCell.Tab.0.right/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="930" height="191" key="GridCell.Tab.0.right/32.23.1888.1177@32.23.1888.1177" timestamp="1592449034589" />
<state width="1363" height="191" key="GridCell.Tab.0.right/35.23.1405.877@35.23.1405.877" timestamp="1592296979549" />
<state width="499" height="907" key="GridCell.Tab.0.right/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" />
<state width="826" height="191" key="GridCell.Tab.0.right/35.23.1885.1177@35.23.1885.1177" timestamp="1592375232702" />
<state width="930" height="191" key="GridCell.Tab.0.right/35.23.1885.1177@35.23.1885.1177" timestamp="1592393512539" />
<state width="1602" height="270" key="GridCell.Tab.0.right/36.23.1644.1027@36.23.1644.1027" timestamp="1591942534759" />
<state width="1842" height="270" key="GridCell.Tab.0.right/36.23.1884.1177@36.23.1884.1177" timestamp="1591966213327" />
<state width="252" height="1057" key="GridCell.Tab.0.right/37.23.1403.877/1440.-199.1920.1177@1440.-199.1920.1177" timestamp="1591854408196" />
......@@ -614,14 +621,15 @@
<screen x="35" y="23" width="1405" height="877" />
</state>
<state width="500" height="445" key="SwitcherDM/35.23.1405.877@35.23.1405.877" timestamp="1592292721015" />
<state x="517" y="313" key="Vcs.Push.Dialog.v2" timestamp="1592373729832">
<screen x="35" y="23" width="1885" height="1177" />
<state x="518" y="313" key="Vcs.Push.Dialog.v2" timestamp="1592385431352">
<screen x="37" y="23" width="1883" height="1177" />
</state>
<state x="491" y="313" key="Vcs.Push.Dialog.v2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884609437" />
<state x="517" y="313" key="Vcs.Push.Dialog.v2/35.23.1885.1177@35.23.1885.1177" timestamp="1592373729832" />
<state x="518" y="313" key="Vcs.Push.Dialog.v2/36.23.1884.1177@36.23.1884.1177" timestamp="1591966205725" />
<state x="2171" y="91" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591189622538" />
<state x="457" y="276" key="Vcs.Push.Dialog.v2/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591846773289" />
<state x="518" y="313" key="Vcs.Push.Dialog.v2/37.23.1883.1177@37.23.1883.1177" timestamp="1592385431352" />
<state x="417" y="141" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1591269112575">
<screen x="37" y="23" width="1643" height="1027" />
</state>
......@@ -643,10 +651,11 @@
<screen x="0" y="23" width="1920" height="1177" />
</state>
<state x="85" y="286" key="run.anything.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591883929114" />
<state x="594" y="283" width="901" height="778" key="search.everywhere.popup" timestamp="1592383713723">
<screen x="37" y="23" width="1883" height="1177" />
<state x="590" y="283" width="904" height="778" key="search.everywhere.popup" timestamp="1592448985084">
<screen x="32" y="23" width="1888" height="1177" />
</state>
<state x="568" y="283" width="917" height="776" key="search.everywhere.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591884167098" />
<state x="590" y="283" width="904" height="778" key="search.everywhere.popup/32.23.1888.1177@32.23.1888.1177" timestamp="1592448985084" />
<state x="450" y="217" width="674" height="580" key="search.everywhere.popup/35.23.1405.877@35.23.1405.877" timestamp="1592296171796" />
<state x="522" y="250" width="670" height="676" key="search.everywhere.popup/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591066027960" />
<state x="592" y="283" width="903" height="778" key="search.everywhere.popup/35.23.1885.1177@35.23.1885.1177" timestamp="1592374136123" />
......
src/ResJson.ts
View file @ 1ba639a1
......@@ -7133,5 +7133,5 @@ export const ResJson = {
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/anything/1592385249/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/anything/1592446436/resource/"
}
\ No newline at end of file
src/scenes/LoadingScene.ts
View file @ 1ba639a1
......@@ -8,7 +8,7 @@ import OptionPool from "../const/OptionPool";
import PlantEffectPool from "../const/PlantEffectPool";
import { RES } from "../../module/RES";
import { gameResource } from "../const/staticData";
import { checkShopFavoredStatus, getAuthUserInfo } from "../utils";
import { checkShopFavoredStatus, getAuthUserInfo, taobaoReport } from "../utils";
import Container = FYGE.Container;
import Sprite = FYGE.Sprite;
import Tween = FYGE.Tween;
......@@ -55,12 +55,12 @@ export class LoadingScene extends Scene {
});
/// test
var isFollow = true;
var isFollow = false;
// @ts-ignore
// isFollow = await checkShopFavoredStatus(sellerId).catch((err) => {
// console.log(err);
// isFollow = false;
// });
isFollow = await checkShopFavoredStatus(sellerId).catch((err) => {
console.log(err);
isFollow = false;
});
console.log('isFollow', isFollow);
setTbData(TbNetName.isFollow, {
......@@ -145,6 +145,8 @@ export class LoadingScene extends Scene {
});
});
taobaoReport('in_index');
for (let i = 0; i <= 20; i++) {
MPush(new ShopItemExchangeInfo());
}
......
src/utils.ts
View file @ 1ba639a1
......@@ -314,3 +314,16 @@ export const getUserAddress = (opts = {}) => {
});
};
/**
* 自定义分析数据的上报接口
* @param logkey
*/
export const taobaoReport = logkey => {
// @ts-ignore
my.reportAnalytics('click', {
// 标志某一类事件，方便数据分析进行分组
'logkey': logkey
})
};
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