Skip to content

D
db-game-template
Commit b6b59ced authored by 邱旭's avatar 邱旭
Browse files
Options

小e

parent c72ad3ba
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 26 deletions
.idea/workspace.xml
View file @ b6b59ced
...@@ -48,8 +48,7 @@ ...@@ -48,8 +48,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="91d65b22-e37e-4b17-b43e-cdc81b9fe6ff" name="Default Changelist" comment=""> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/common.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/common.tmproject" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/src/Main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Main.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/assets/newUser_panel/newUserBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/assets/newUser_panel/newUserBg.png" 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" />
...@@ -118,7 +117,7 @@ ...@@ -118,7 +117,7 @@
<recent name="$PROJECT_DIR$/egret" /> <recent name="$PROJECT_DIR$/egret" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.build"> <component name="RunManager" selected="npm.buildTS">
<configuration name="banner.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/JoyousManor/banner.html" useBuiltInWebServerPort="true"> <configuration name="banner.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/JoyousManor/banner.html" useBuiltInWebServerPort="true">
<method v="2" /> <method v="2" />
</configuration> </configuration>
...@@ -164,9 +163,9 @@ ...@@ -164,9 +163,9 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.dev" /> <item itemvalue="npm.dev" />
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.buildExml" /> <item itemvalue="npm.buildExml" />
<item itemvalue="JavaScript Debug.banner.html" /> <item itemvalue="JavaScript Debug.banner.html" />
</list> </list>
...@@ -287,21 +286,8 @@ ...@@ -287,21 +286,8 @@
<workItem from="1611021224771" duration="241000" /> <workItem from="1611021224771" duration="241000" />
<workItem from="1611027458495" duration="4259000" /> <workItem from="1611027458495" duration="4259000" />
<workItem from="1611135191598" duration="1335000" /> <workItem from="1611135191598" duration="1335000" />
<workItem from="1611192072114" duration="91000" /> <workItem from="1611192072114" duration="157000" />
</task> <workItem from="1611308200540" duration="394000" />
<task id="LOCAL-00005" summary="更新">
<created>1603717521313</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1603717521313</updated>
</task>
<task id="LOCAL-00006" summary="更新">
<created>1603787270950</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1603787270950</updated>
</task> </task>
<task id="LOCAL-00007" summary="更新"> <task id="LOCAL-00007" summary="更新">
<created>1603791497689</created> <created>1603791497689</created>
...@@ -632,7 +618,21 @@ ...@@ -632,7 +618,21 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1611032432135</updated> <updated>1611032432135</updated>
</task> </task>
<option name="localTasksCounter" value="54" /> <task id="LOCAL-00054" summary="小e">
<created>1611193405985</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1611193405988</updated>
</task>
<task id="LOCAL-00055" summary="小e">
<created>1611193421738</created>
<option name="number" value="00055" />
<option name="presentableId" value="LOCAL-00055" />
<option name="project" value="LOCAL" />
<updated>1611193421739</updated>
</task>
<option name="localTasksCounter" value="56" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -695,14 +695,14 @@ ...@@ -695,14 +695,14 @@
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </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="181" y="287" key="#com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1603801680351" />
<state x="514" y="185" key="CommitChangelistDialog2" timestamp="1611032431937"> <state x="514" y="185" key="CommitChangelistDialog2" timestamp="1611193421540">
<screen x="41" y="25" width="1879" height="1175" /> <screen x="41" y="25" width="1879" height="1175" />
</state> </state>
<state x="506" y="183" key="CommitChangelistDialog2/30.23.1890.1177@30.23.1890.1177" timestamp="1603717521076" /> <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="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="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="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="1611032431937" /> <state x="514" y="185" key="CommitChangelistDialog2/41.25.1879.1175@41.25.1879.1175" timestamp="1611193421540" />
<state x="455" y="165" key="CommitChangelistDialog2/42.25.1638.1025@42.25.1638.1025" timestamp="1608882483854" /> <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 x="515" y="185" key="CommitChangelistDialog2/42.25.1878.1175@42.25.1878.1175" timestamp="1609209149489" />
<state width="1278" height="402" key="GridCell.Tab.0.bottom" timestamp="1611136000960"> <state width="1278" height="402" key="GridCell.Tab.0.bottom" timestamp="1611136000960">
...@@ -846,13 +846,13 @@ ...@@ -846,13 +846,13 @@
<state x="246" y="270" key="SettingsEditor.inPresentationMode/30.23.1890.1177@30.23.1890.1177" timestamp="1603801810750" /> <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="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="329" y="425" key="SettingsEditor/42.25.1878.1175@42.25.1878.1175" timestamp="1608716521124" />
<state x="582" y="340" key="Vcs.Push.Dialog.v2" timestamp="1611032433089"> <state x="582" y="340" key="Vcs.Push.Dialog.v2" timestamp="1611193393302">
<screen x="41" y="25" width="1879" height="1175" /> <screen x="41" y="25" width="1879" height="1175" />
</state> </state>
<state x="575" y="338" key="Vcs.Push.Dialog.v2/30.23.1890.1177@30.23.1890.1177" timestamp="1603939922392" /> <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="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="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="1611032433089" /> <state x="582" y="340" key="Vcs.Push.Dialog.v2/41.25.1879.1175@41.25.1879.1175" timestamp="1611193393302" />
<state x="514" y="300" key="Vcs.Push.Dialog.v2/42.25.1638.1025@42.25.1638.1025" timestamp="1608882486132" /> <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="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"> <state x="341" y="297" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1608789122669">
......
egret/src/Main.ts
View file @ b6b59ced
...@@ -96,7 +96,9 @@ class Main extends eui.UILayer { ...@@ -96,7 +96,9 @@ class Main extends eui.UILayer {
// NetManager.ins.getRule((success, res) => { // NetManager.ins.getRule((success, res) => {
// }); // });
this.addChild(new Bar()).y = -2; if (window['bar']) {
this.addChild(new Bar()).y = -2;
}
await this.getGameRes(); await this.getGameRes();
...@@ -147,4 +149,4 @@ class Main extends eui.UILayer { ...@@ -147,4 +149,4 @@ class Main extends eui.UILayer {
} }
} }
window['Main'] = Main; window['Main'] = Main;
\ No newline at end of file
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