1

.buildrc.js

@@ -18,7 +18,6 @@ module.exports = {
         '/summer/*': 'http://localhost:3000',
         '/signpet/*': 'http://localhost:3000',
         '/signactivity/*': 'http://localhost:3000',
-        '/activityPlugDrawInfo/*': 'http://localhost:3000',
         '/Crecord/*': 'http://localhost:3000',
         '/sign/*': 'http://localhost:3000',
         '/duiba/*': 'http://localhost:3000',

.gitignore

@@ -23,5 +23,4 @@
 # 会忽略 doc/notes.txt 但不包括 doc/server/arch.txt
 node_modules
 bin-release
-.DS_Store
-egret/resource/TextureMerger
+.DS_Store
\ No newline at end of file
\ No newline at end of file

.idea/workspace.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="9464afa6-0efb-46c2-9cfd-05475acd81df" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.buildrc.js" beforeDir="false" afterPath="$PROJECT_DIR$/.buildrc.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
@@ -112,6 +113,7 @@
       <workItem from="1576806980182" duration="7591000" />
       <workItem from="1577069181480" duration="20171000" />
       <workItem from="1577106840316" duration="37273000" />
+      <workItem from="1577244740252" duration="1671000" />
     </task>
     <servers />
   </component>
@@ -147,10 +149,10 @@
       <screen x="36" y="23" width="1644" height="1027" />
     </state>
     <state x="586" y="160" key="refactoring.ChangeSignatureDialog/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027" timestamp="1575965663028" />
-    <state x="523" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1577243738846">
+    <state x="523" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1577245336297">
       <screen x="36" y="23" width="1644" height="1027" />
     </state>
-    <state x="523" y="250" width="670" height="676" key="search.everywhere.popup/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027" timestamp="1577243738846" />
+    <state x="523" y="250" width="670" height="676" key="search.everywhere.popup/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027" timestamp="1577245336297" />
     <state x="523" y="250" width="670" height="676" key="search.everywhere.popup/36.23.1644.1027@36.23.1644.1027" timestamp="1576573315855" />
   </component>
   <component name="XDebuggerManager">