1

.idea/workspace.xml

@@ -48,7 +48,7 @@
   <component name="ChangeListManager">
     <list default="true" id="91d65b22-e37e-4b17-b43e-cdc81b9fe6ff" 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$/测试.html" beforeDir="false" afterPath="$PROJECT_DIR$/测试.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/egret/src/Main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Main.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -117,7 +117,7 @@
       <recent name="$PROJECT_DIR$/egret/src/Scenes/RoomScene" />
     </key>
   </component>
-  <component name="RunManager" selected="npm.build">
+  <component name="RunManager" selected="npm.dev">
     <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
       <package-json value="$PROJECT_DIR$/package.json" />
       <command value="run" />
@@ -160,9 +160,9 @@
     </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="npm.dev" />
         <item itemvalue="npm.build" />
         <item itemvalue="npm.buildTS" />
-        <item itemvalue="npm.dev" />
         <item itemvalue="npm.buildExml" />
       </list>
     </recent_temporary>
@@ -269,7 +269,8 @@
       <workItem from="1609120248111" duration="10865000" />
       <workItem from="1609207565387" duration="168000" />
       <workItem from="1609207795258" duration="2677000" />
-      <workItem from="1609242766319" duration="1867000" />
+      <workItem from="1609242766319" duration="1873000" />
+      <workItem from="1609302432191" duration="773000" />
     </task>
     <task id="LOCAL-00001" summary="fk">
       <created>1599451512431</created>
@@ -593,7 +594,14 @@
       <option name="project" value="LOCAL" />
       <updated>1609209149770</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="修改扣积分desc">
+      <created>1609247836000</created>
+      <option name="number" value="00047" />
+      <option name="presentableId" value="LOCAL-00047" />
+      <option name="project" value="LOCAL" />
+      <updated>1609247836000</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -650,13 +658,14 @@
       <screen x="30" y="23" width="1890" height="1177" />
     </state>
     <state x="181" y="287" key="#com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1603801680351" />
-    <state x="515" y="185" key="CommitChangelistDialog2" timestamp="1609209149489">
-      <screen x="42" y="25" width="1878" height="1175" />
+    <state x="514" y="185" key="CommitChangelistDialog2" timestamp="1609247835783">
+      <screen x="41" y="25" width="1879" height="1175" />
     </state>
     <state x="506" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1603717521076" />
     <state x="447" y="163" key="CommitChangelistDialog2/32.23.1648.1027@32.23.1648.1027" timestamp="1605968458720" />
     <state x="507" y="183" key="CommitChangelistDialog2/32.23.1888.1177@32.23.1888.1177" timestamp="1605688762315" />
     <state x="513" y="185" key="CommitChangelistDialog2/39.25.1881.1175@39.25.1881.1175" timestamp="1606803937022" />
+    <state x="514" y="185" key="CommitChangelistDialog2/41.25.1879.1175@41.25.1879.1175" timestamp="1609247835783" />
     <state x="455" y="165" key="CommitChangelistDialog2/42.25.1638.1025@42.25.1638.1025" timestamp="1608882483854" />
     <state x="515" y="185" key="CommitChangelistDialog2/42.25.1878.1175@42.25.1878.1175" timestamp="1609209149489" />
     <state width="1405" height="289" key="GridCell.Tab.0.bottom" timestamp="1609209118290">
@@ -780,12 +789,13 @@
     <state x="246" y="270" key="SettingsEditor.inPresentationMode/30.23.1890.1177@30.23.1890.1177" timestamp="1603801810750" />
     <state x="319" y="424" key="SettingsEditor/30.23.1890.1177@30.23.1890.1177" timestamp="1603802072691" />
     <state x="329" y="425" key="SettingsEditor/42.25.1878.1175@42.25.1878.1175" timestamp="1608716521124" />
-    <state x="583" y="340" key="Vcs.Push.Dialog.v2" timestamp="1609209151359">
-      <screen x="42" y="25" width="1878" height="1175" />
+    <state x="582" y="340" key="Vcs.Push.Dialog.v2" timestamp="1609247837063">
+      <screen x="41" y="25" width="1879" height="1175" />
     </state>
     <state x="575" y="338" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1603939922392" />
     <state x="507" y="298" key="Vcs.Push.Dialog.v2/32.23.1648.1027@32.23.1648.1027" timestamp="1605968451224" />
     <state x="576" y="338" key="Vcs.Push.Dialog.v2/32.23.1888.1177@32.23.1888.1177" timestamp="1605688763746" />
+    <state x="582" y="340" key="Vcs.Push.Dialog.v2/41.25.1879.1175@41.25.1879.1175" timestamp="1609247837063" />
     <state x="514" y="300" key="Vcs.Push.Dialog.v2/42.25.1638.1025@42.25.1638.1025" timestamp="1608882486132" />
     <state x="583" y="340" key="Vcs.Push.Dialog.v2/42.25.1878.1175@42.25.1878.1175" timestamp="1609209151359" />
     <state x="341" y="297" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1608789122669">
@@ -814,13 +824,14 @@
       <screen x="30" y="23" width="1890" height="1177" />
     </state>
     <state x="960" y="593" width="778" height="503" key="org.intellij.images.editor.actions.BackgroundImageDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1603777183383" />
-    <state x="648" y="289" width="895" height="676" key="search.everywhere.popup" timestamp="1609207602037">
-      <screen x="42" y="25" width="1878" height="1175" />
+    <state x="647" y="289" width="896" height="676" key="search.everywhere.popup" timestamp="1609303336175">
+      <screen x="41" y="25" width="1879" height="1175" />
     </state>
     <state x="485" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1603247992539" />
     <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1603939435830" />
     <state x="486" y="220" width="670" height="504" key="search.everywhere.popup/32.23.1408.877@32.23.1408.877" timestamp="1604066536579" />
     <state x="646" y="289" width="896" height="676" key="search.everywhere.popup/39.25.1881.1175@39.25.1881.1175" timestamp="1606988621747" />
+    <state x="647" y="289" width="896" height="676" key="search.everywhere.popup/41.25.1879.1175@41.25.1879.1175" timestamp="1609303336175" />
     <state x="571" y="255" width="781" height="590" key="search.everywhere.popup/42.25.1638.1025@42.25.1638.1025" timestamp="1608883491482" />
     <state x="648" y="289" width="895" height="676" key="search.everywhere.popup/42.25.1878.1175@42.25.1878.1175" timestamp="1609207602037" />
   </component>

egret/src/Main.ts

@@ -116,7 +116,25 @@ class Main extends eui.UILayer {
             return;
         }
 
-        SceneCtrl.instance.change(ModuleTypes.MAIN_SCENE);
+        let queryParams: any = {};
+
+        let search = window.location.search;
+        try {
+            search = top.location.search;  //尝试获取顶层的链接
+        } catch (e) {
+        }
+
+        for (let item of search.replace('?', '').split('&')) {
+            let arr = item.split('=');
+            queryParams[arr[0]] = arr.length === 1 ? true : arr[1];
+        }
+
+        // goHome
+        if (queryParams.gohome) {
+            SceneCtrl.instance.change(ModuleTypes.ROOM_SCENE);
+        } else {
+            SceneCtrl.instance.change(ModuleTypes.MAIN_SCENE);
+        }
 
     }