Skip to content

Q
qiaqia_qx
Commit 2add8d07 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1111

parent dd7c7b58
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 22 deletions
.idea/workspace.xml
View file @ 2add8d07
...@@ -3,10 +3,7 @@ ...@@ -3,10 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="31be0130-d27d-4740-b668-956a8050e1bf" name="Default Changelist" comment=""> <list default="true" id="31be0130-d27d-4740-b668-956a8050e1bf" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/miniTb/qiaqiaHome.getGameInfo.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/qiaqiaHome.getGameInfo.json" 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/Tools.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/const/staticData.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/const/staticData.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scenes/GuideScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scenes/GuideScene.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -168,7 +165,19 @@ ...@@ -168,7 +165,19 @@
<workItem from="1592880254194" duration="133000" /> <workItem from="1592880254194" duration="133000" />
<workItem from="1592891317317" duration="225000" /> <workItem from="1592891317317" duration="225000" />
<workItem from="1592898077650" duration="39000" /> <workItem from="1592898077650" duration="39000" />
<workItem from="1592899588446" duration="730000" /> <workItem from="1592899588446" duration="1430000" />
<workItem from="1592919228595" duration="976000" />
<workItem from="1592963205879" duration="641000" />
<workItem from="1593310573418" duration="48000" />
<workItem from="1593314137563" duration="220000" />
<workItem from="1593412648585" duration="1435000" />
<workItem from="1593497459776" duration="49000" />
<workItem from="1593568790723" duration="708000" />
<workItem from="1593576665522" duration="3000" />
<workItem from="1593655030392" duration="89000" />
<workItem from="1593672225836" duration="14000" />
<workItem from="1593672335117" duration="1116000" />
<workItem from="1593761062744" duration="13000" />
</task> </task>
<task id="LOCAL-00001" summary="1"> <task id="LOCAL-00001" summary="1">
<created>1591003912929</created> <created>1591003912929</created>
...@@ -506,7 +515,14 @@ ...@@ -506,7 +515,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1592880318373</updated> <updated>1592880318373</updated>
</task> </task>
<option name="localTasksCounter" value="49" /> <task id="LOCAL-00049" summary="1111">
<created>1592900414010</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1592900414010</updated>
</task>
<option name="localTasksCounter" value="50" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -563,10 +579,11 @@ ...@@ -563,10 +579,11 @@
</state> </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="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="764" y="293" key="#com.intellij.ide.util.MemberChooser/37.23.1883.1177@37.23.1883.1177" timestamp="1591929411133" />
<state x="525" y="120" key="CommitChangelistDialog2" timestamp="1592880318097"> <state x="524" y="120" key="CommitChangelistDialog2" timestamp="1592900413768">
<screen x="32" y="23" width="1888" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="502" y="120" key="CommitChangelistDialog2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884607456" /> <state x="502" y="120" key="CommitChangelistDialog2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884607456" />
<state x="524" y="120" key="CommitChangelistDialog2/31.23.1889.1177@31.23.1889.1177" timestamp="1592900413768" />
<state x="525" y="120" key="CommitChangelistDialog2/32.23.1888.1177@32.23.1888.1177" timestamp="1592880318097" /> <state x="525" y="120" key="CommitChangelistDialog2/32.23.1888.1177@32.23.1888.1177" timestamp="1592880318097" />
<state x="411" y="44" key="CommitChangelistDialog2/35.23.1405.877@35.23.1405.877" timestamp="1592293157840" /> <state x="411" y="44" key="CommitChangelistDialog2/35.23.1405.877@35.23.1405.877" timestamp="1592293157840" />
<state x="466" y="108" key="CommitChangelistDialog2/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591003912498" /> <state x="466" y="108" key="CommitChangelistDialog2/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591003912498" />
...@@ -576,11 +593,11 @@ ...@@ -576,11 +593,11 @@
<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/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="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="1592385429485" /> <state x="529" y="120" key="CommitChangelistDialog2/37.23.1883.1177@37.23.1883.1177" timestamp="1592385429485" />
<state width="1366" height="130" key="GridCell.Tab.0.bottom" timestamp="1592900135143"> <state width="1366" height="130" key="GridCell.Tab.0.bottom" timestamp="1593310620673">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="1601" height="346" key="GridCell.Tab.0.bottom/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" /> <state width="1601" height="346" key="GridCell.Tab.0.bottom/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="1366" height="130" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1592900135143" /> <state width="1366" height="130" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1593310620673" />
<state width="1366" height="130" key="GridCell.Tab.0.bottom/32.23.1888.1177@32.23.1888.1177" timestamp="1592891542793" /> <state width="1366" height="130" key="GridCell.Tab.0.bottom/32.23.1888.1177@32.23.1888.1177" timestamp="1592891542793" />
<state width="1363" height="191" key="GridCell.Tab.0.bottom/35.23.1405.877@35.23.1405.877" timestamp="1592296979551" /> <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="499" height="907" key="GridCell.Tab.0.bottom/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" />
...@@ -592,11 +609,11 @@ ...@@ -592,11 +609,11 @@
<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="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="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.bottom/37.23.1883.1177@37.23.1883.1177" timestamp="1592385235055" />
<state width="1366" height="130" key="GridCell.Tab.0.center" timestamp="1592900135143"> <state width="1366" height="130" key="GridCell.Tab.0.center" timestamp="1593310620673">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="1601" height="346" key="GridCell.Tab.0.center/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" /> <state width="1601" height="346" key="GridCell.Tab.0.center/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="1366" height="130" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1592900135143" /> <state width="1366" height="130" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1593310620673" />
<state width="1366" height="130" key="GridCell.Tab.0.center/32.23.1888.1177@32.23.1888.1177" timestamp="1592891542793" /> <state width="1366" height="130" key="GridCell.Tab.0.center/32.23.1888.1177@32.23.1888.1177" timestamp="1592891542793" />
<state width="1363" height="191" key="GridCell.Tab.0.center/35.23.1405.877@35.23.1405.877" timestamp="1592296979547" /> <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="499" height="907" key="GridCell.Tab.0.center/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953116" />
...@@ -608,11 +625,11 @@ ...@@ -608,11 +625,11 @@
<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="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="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.center/37.23.1883.1177@37.23.1883.1177" timestamp="1592385235054" />
<state width="1366" height="130" key="GridCell.Tab.0.left" timestamp="1592900135142"> <state width="1366" height="130" key="GridCell.Tab.0.left" timestamp="1593310620673">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="1601" height="346" key="GridCell.Tab.0.left/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614403" /> <state width="1601" height="346" key="GridCell.Tab.0.left/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614403" />
<state width="1366" height="130" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1592900135142" /> <state width="1366" height="130" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1593310620673" />
<state width="1366" height="130" key="GridCell.Tab.0.left/32.23.1888.1177@32.23.1888.1177" timestamp="1592891542792" /> <state width="1366" height="130" key="GridCell.Tab.0.left/32.23.1888.1177@32.23.1888.1177" timestamp="1592891542792" />
<state width="1363" height="191" key="GridCell.Tab.0.left/35.23.1405.877@35.23.1405.877" timestamp="1592296979544" /> <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="499" height="907" key="GridCell.Tab.0.left/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953114" />
...@@ -624,11 +641,11 @@ ...@@ -624,11 +641,11 @@
<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="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="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.left/37.23.1883.1177@37.23.1883.1177" timestamp="1592385235054" />
<state width="1366" height="130" key="GridCell.Tab.0.right" timestamp="1592900135143"> <state width="1366" height="130" key="GridCell.Tab.0.right" timestamp="1593310620673">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="1601" height="346" key="GridCell.Tab.0.right/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" /> <state width="1601" height="346" key="GridCell.Tab.0.right/0.23.1920.1177@0.23.1920.1177" timestamp="1591884614404" />
<state width="1366" height="130" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1592900135143" /> <state width="1366" height="130" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1593310620673" />
<state width="1366" height="130" key="GridCell.Tab.0.right/32.23.1888.1177@32.23.1888.1177" timestamp="1592891542793" /> <state width="1366" height="130" key="GridCell.Tab.0.right/32.23.1888.1177@32.23.1888.1177" timestamp="1592891542793" />
<state width="1363" height="191" key="GridCell.Tab.0.right/35.23.1405.877@35.23.1405.877" timestamp="1592296979549" /> <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="499" height="907" key="GridCell.Tab.0.right/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1591065953118" />
...@@ -650,14 +667,16 @@ ...@@ -650,14 +667,16 @@
</state> </state>
<state x="614" y="245" key="RollbackChangesDialog/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1590993046653" /> <state x="614" y="245" key="RollbackChangesDialog/35.23.1645.1027/1680.-199.1920.1177@35.23.1645.1027" timestamp="1590993046653" />
<state x="615" y="245" key="RollbackChangesDialog/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591077661188" /> <state x="615" y="245" key="RollbackChangesDialog/37.23.1643.1027/1680.-199.1920.1177@37.23.1643.1027" timestamp="1591077661188" />
<state width="500" height="445" key="SwitcherDM" timestamp="1592292721015"> <state width="673" height="598" key="SwitcherDM" timestamp="1593568793331">
<screen x="35" y="23" width="1405" height="877" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state width="673" height="598" key="SwitcherDM/31.23.1889.1177@31.23.1889.1177" timestamp="1593568793331" />
<state width="500" height="445" key="SwitcherDM/35.23.1405.877@35.23.1405.877" timestamp="1592292721015" /> <state width="500" height="445" key="SwitcherDM/35.23.1405.877@35.23.1405.877" timestamp="1592292721015" />
<state x="514" y="313" key="Vcs.Push.Dialog.v2" timestamp="1592880319676"> <state x="474" y="276" key="Vcs.Push.Dialog.v2" timestamp="1592900416655">
<screen x="32" y="23" width="1888" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </state>
<state x="491" y="313" key="Vcs.Push.Dialog.v2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884609437" /> <state x="491" y="313" key="Vcs.Push.Dialog.v2/0.23.1920.1177@0.23.1920.1177" timestamp="1591884609437" />
<state x="474" y="276" key="Vcs.Push.Dialog.v2/31.23.1889.1177@31.23.1889.1177" timestamp="1592900416655" />
<state x="514" y="313" key="Vcs.Push.Dialog.v2/32.23.1888.1177@32.23.1888.1177" timestamp="1592880319676" /> <state x="514" y="313" key="Vcs.Push.Dialog.v2/32.23.1888.1177@32.23.1888.1177" timestamp="1592880319676" />
<state x="517" y="313" key="Vcs.Push.Dialog.v2/35.23.1885.1177@35.23.1885.1177" timestamp="1592373729832" /> <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="518" y="313" key="Vcs.Push.Dialog.v2/36.23.1884.1177@36.23.1884.1177" timestamp="1591966205725" />
...@@ -685,11 +704,12 @@ ...@@ -685,11 +704,12 @@
<screen x="0" y="23" width="1920" height="1177" /> <screen x="0" y="23" width="1920" height="1177" />
</state> </state>
<state x="85" y="286" key="run.anything.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591883929114" /> <state x="85" y="286" key="run.anything.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591883929114" />
<state x="589" y="283" width="905" height="778" key="search.everywhere.popup" timestamp="1592899600409"> <state x="589" y="283" width="905" height="778" key="search.everywhere.popup" timestamp="1593761065776">
<screen x="31" y="23" width="1889" height="1177" /> <screen x="31" y="23" width="1889" height="1177" />
</state> </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="568" y="283" width="917" height="776" key="search.everywhere.popup/0.23.1920.1177@0.23.1920.1177" timestamp="1591884167098" />
<state x="589" y="283" width="905" height="778" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1592899600409" /> <state x="518" y="250" width="791" height="679" key="search.everywhere.popup/31.23.1649.1027@31.23.1649.1027" timestamp="1592919255415" />
<state x="589" y="283" width="905" height="778" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1593761065776" />
<state x="2007" y="283" width="920" height="778" key="search.everywhere.popup/32.23.1408.877/1440.23.1920.1177@1440.23.1920.1177" timestamp="1592552467353" /> <state x="2007" y="283" width="920" height="778" key="search.everywhere.popup/32.23.1408.877/1440.23.1920.1177@1440.23.1920.1177" timestamp="1592552467353" />
<state x="590" y="283" width="904" height="778" key="search.everywhere.popup/32.23.1888.1177@32.23.1888.1177" timestamp="1592891486677" /> <state x="590" y="283" width="904" height="778" key="search.everywhere.popup/32.23.1888.1177@32.23.1888.1177" timestamp="1592891486677" />
<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="450" y="217" width="674" height="580" key="search.everywhere.popup/35.23.1405.877@35.23.1405.877" timestamp="1592296171796" />
......
src/parts/UI/UILayer.ts
View file @ 2add8d07
...@@ -81,6 +81,8 @@ export class UILayer extends Container { ...@@ -81,6 +81,8 @@ export class UILayer extends Container {
case this.recordBtn: case this.recordBtn:
PanelCtrl.instance.show(ExRecordPanel); PanelCtrl.instance.show(ExRecordPanel);
break; break;
// "navigationBarForceEnable": true,
// "allowsBounceVertical": "NO"
} }
} }
......
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