Skip to content

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

Default Changelist

parent 5b061019
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 30 deletions
.idea/workspace.xml
View file @ 7cb03c60
......@@ -48,33 +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$/egret/resource/TextureMerger/bar.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/bar.tmproject" 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/resource/TextureMerger/exchange.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/exchange.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/exchange_panel.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/exchange_panel.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/exchanged_panel.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/exchanged_panel.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/gameGroup_panel.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/gameGroup_panel.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/guide.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/guide.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/index_plant.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/index_plant.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/introduce_panel.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/introduce_panel.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/loading.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/loading.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/loading_scene.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/loading_scene.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/main_scene.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/main_scene.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/main_ui.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/main_ui.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/medal_panel.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/medal_panel.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/medals.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/medals.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/newUser_panel.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/newUser_panel.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/oldUser_panel.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/oldUser_panel.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/room.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/room.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/sellRecord.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/sellRecord.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/sell_panel.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/sell_panel.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/selled_panel.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/selled_panel.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/shop.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/shop.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/task_panel.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/task_panel.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/unlock_panel.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/unlock_panel.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/TextureMerger/warehouse.tmproject" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/TextureMerger/warehouse.tmproject" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/ExchangeScene/ExchangeScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/ExchangeScene/ExchangeScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mock/projectX/queryRecords.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/projectX/queryRecords.json" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -151,7 +125,7 @@
<recent name="$PROJECT_DIR$/egret" />
</key>
</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">
<method v="2" />
</configuration>
......@@ -197,8 +171,8 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="npm.build" />
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.buildExml" />
</list>
......@@ -321,7 +295,7 @@
<workItem from="1611135191598" duration="1335000" />
<workItem from="1611192072114" duration="157000" />
<workItem from="1611308200540" duration="394000" />
<workItem from="1615362536527" duration="1843000" />
<workItem from="1615362536527" duration="3476000" />
</task>
<task id="LOCAL-00007" summary="更新">
<created>1603791497689</created>
......
egret/src/Scenes/ExchangeScene/ExchangeScene.ts
View file @ 7cb03c60
......@@ -173,7 +173,7 @@ export default class ExchangeScene extends Scene {
}
resolve(); /// TODO 移到下面去
});
resolve(); /// TODO 上面移下来的
// resolve(); /// TODO 上面移下来的
///////////////////////// 查询是否合成过 /////////////////////////
}, prizeIds);
......
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