Default Changelist

.idea/workspace.xml

@@ -46,8 +46,10 @@
     <select />
   </component>
   <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="Default Changelist">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/src/Panels/ExchangePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/ExchangePanel.ts" 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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -108,7 +110,7 @@
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="prettierjs.PrettierConfiguration.Package" value="$PROJECT_DIR$/node_modules/prettier" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="settings.editor.selected.configurable" value="web-ide.project.structure" />
     <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
     <property name="vue.rearranger.settings.migration" value="true" />
   </component>
@@ -125,7 +127,7 @@
       <recent name="$PROJECT_DIR$/egret" />
     </key>
   </component>
-  <component name="RunManager" selected="npm.buildTS">
+  <component name="RunManager" selected="npm.build">
     <configuration name="banner.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/JoyousManor/banner.html" useBuiltInWebServerPort="true">
       <method v="2" />
     </configuration>
@@ -171,8 +173,8 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="npm.buildTS" />
         <item itemvalue="npm.build" />
+        <item itemvalue="npm.buildTS" />
         <item itemvalue="npm.dev" />
         <item itemvalue="npm.buildExml" />
       </list>
@@ -295,14 +297,14 @@
       <workItem from="1611135191598" duration="1335000" />
       <workItem from="1611192072114" duration="157000" />
       <workItem from="1611308200540" duration="394000" />
-      <workItem from="1615362536527" duration="3476000" />
-    </task>
-    <task id="LOCAL-00007" summary="更新">
-      <created>1603791497689</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1603791497689</updated>
+      <workItem from="1615362536527" duration="5799000" />
+      <workItem from="1615536189509" duration="799000" />
+      <workItem from="1615537268972" duration="111000" />
+      <workItem from="1615537759451" duration="3839000" />
+      <workItem from="1616119826215" duration="3221000" />
+      <workItem from="1616141373483" duration="666000" />
+      <workItem from="1616650815558" duration="236000" />
+      <workItem from="1616726563592" duration="2883000" />
     </task>
     <task id="LOCAL-00008" summary="更新">
       <created>1603799550747</created>
@@ -640,7 +642,14 @@
       <option name="project" value="LOCAL" />
       <updated>1611193421739</updated>
     </task>
-    <option name="localTasksCounter" value="56" />
+    <task id="LOCAL-00056" summary="Default Changelist">
+      <created>1615367020390</created>
+      <option name="number" value="00056" />
+      <option name="presentableId" value="LOCAL-00056" />
+      <option name="project" value="LOCAL" />
+      <updated>1615367020391</updated>
+    </task>
+    <option name="localTasksCounter" value="57" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -684,6 +693,7 @@
     <MESSAGE value="修改扣积分desc" />
     <MESSAGE value="1" />
     <MESSAGE value="小e" />
-    <option name="LAST_COMMIT_MESSAGE" value="小e" />
+    <MESSAGE value="Default Changelist" />
+    <option name="LAST_COMMIT_MESSAGE" value="Default Changelist" />
   </component>
 </project>
\ No newline at end of file

egret/src/Main.ts

@@ -71,7 +71,7 @@ class Main extends eui.UILayer {
     }
 
     private loadTheme() {
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
             // load skin theme configuration file, you can manually modify the file. And replace the default skin.
             //加载皮肤主题配置文件,可以手动修改这个文件。替换默认皮肤。
             let theme = new eui.Theme("resource/default.thm.json", this.stage);

egret/src/Panels/ExchangePanel.ts

@@ -52,6 +52,10 @@ export default class ExchangePanel extends Panel {
             return;
         }
         NetManager.ins.prizeExchange((success, res) => {
+            if(!success && res.code == "300061"){
+                showToast(res.message);
+                return;
+            }
             if(!success) {
                 showToast('啊哦...目前无法兑换哦');
                 return;

egret/src/Scenes/ExchangeScene/ExchangeScene.ts

@@ -159,21 +159,21 @@ export default class ExchangeScene extends Scene {
                     }
                     ///////////////////////// 查询是否合成过 /////////////////////////
                     /// TODO 2020.11.18, 运营要求所有奖品可以无限制兑换，去掉兑换一次的限制
-                    NetManager.ins.queryRecords((success, res) => {
-                        if (!success) {
-                            reject();
-                            return;
-                        }
-                        const __data = res.data;
-                        for (let v of __data) {
-                            let prizeId = v.prizeId;
-                            if (this.prizeData.hasOwnProperty(prizeId)) {
-                                this.prizeData[prizeId].canGet = false;
-                            }
-                        }
-                        resolve();   /// TODO 移到下面去
-                    });
-                    // resolve(); /// TODO 上面移下来的
+                    // NetManager.ins.queryRecords((success, res) => {
+                    //     if (!success) {
+                    //         reject();
+                    //         return;
+                    //     }
+                    //     const __data = res.data;
+                    //     for (let v of __data) {
+                    //         let prizeId = v.prizeId;
+                    //         if (this.prizeData.hasOwnProperty(prizeId)) {
+                    //             this.prizeData[prizeId].canGet = false;
+                    //         }
+                    //     }
+                    //     resolve();   /// TODO 移到下面去
+                    // });
+                    resolve(); /// TODO 上面移下来的
 
                     ///////////////////////// 查询是否合成过 /////////////////////////
                 }, prizeIds);