1

.idea/workspace.xml

@@ -2,12 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ca828aa9-7d32-43b5-949b-5692dab70d5f" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/build/fyge.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/build/fyge.min.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/fyge.min.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/build/fyge.min.js.map" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/2d/display/DisplayObject.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/2d/display/DisplayObject.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/2d/events/EventDispatcher.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/2d/events/EventDispatcher.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -31,7 +26,7 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/scripts" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="nodejs_package_manager_path" value="npm" />
@@ -40,6 +35,7 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/scripts" />
       <recent name="$PROJECT_DIR$" />
     </key>
   </component>
@@ -106,7 +102,7 @@
       <workItem from="1591165756008" duration="509000" />
       <workItem from="1591166636799" duration="1935000" />
       <workItem from="1591239594676" duration="141000" />
-      <workItem from="1591239837585" duration="387000" />
+      <workItem from="1591239837585" duration="691000" />
     </task>
     <servers />
   </component>
@@ -119,22 +115,22 @@
     </option>
   </component>
   <component name="WindowStateProjectService">
-    <state width="1878" height="330" key="GridCell.Tab.0.bottom" timestamp="1591169612250">
+    <state width="1878" height="330" key="GridCell.Tab.0.bottom" timestamp="1591240457835">
       <screen x="1680" y="-199" width="1920" height="1177" />
     </state>
-    <state width="1878" height="330" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591169612250" />
-    <state width="1878" height="330" key="GridCell.Tab.0.center" timestamp="1591169612249">
+    <state width="1878" height="330" key="GridCell.Tab.0.bottom/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591240457835" />
+    <state width="1878" height="330" key="GridCell.Tab.0.center" timestamp="1591240457831">
       <screen x="1680" y="-199" width="1920" height="1177" />
     </state>
-    <state width="1878" height="330" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591169612249" />
-    <state width="1878" height="330" key="GridCell.Tab.0.left" timestamp="1591169612248">
+    <state width="1878" height="330" key="GridCell.Tab.0.center/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591240457830" />
+    <state width="1878" height="330" key="GridCell.Tab.0.left" timestamp="1591240457830">
       <screen x="1680" y="-199" width="1920" height="1177" />
     </state>
-    <state width="1878" height="330" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591169612248" />
-    <state width="1878" height="330" key="GridCell.Tab.0.right" timestamp="1591169612249">
+    <state width="1878" height="330" key="GridCell.Tab.0.left/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591240457830" />
+    <state width="1878" height="330" key="GridCell.Tab.0.right" timestamp="1591240457833">
       <screen x="1680" y="-199" width="1920" height="1177" />
     </state>
-    <state width="1878" height="330" key="GridCell.Tab.0.right/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591169612249" />
+    <state width="1878" height="330" key="GridCell.Tab.0.right/37.23.1643.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1591240457833" />
     <state x="2305" y="66" width="670" height="676" key="search.everywhere.popup" timestamp="1591239621122">
       <screen x="1680" y="-199" width="1920" height="1177" />
     </state>

package.json

 {
-<<<<<<< HEAD
     "name": "fyge-tbmini",
-    "version": "1.0.9",
+    "version": "1.1.1",
     "description": "淘宝小程序canvas渲染引擎",
     "main": "./build/fyge.min.js",
     "types": "./build/FYGE.d.ts",
@@ -36,31 +35,4 @@
     "keywords": [
         "淘宝小程序，canvas，webgl"
     ]
-=======
-  "name": "fyge-tbmini",
-  "version": "1.1.1",
-  "description": "淘宝小程序canvas渲染引擎",
-  "main": "./build/fyge.min.js",
-  "types": "./build/FYGE.d.ts",
-  "dependencies": {},
-  "scripts": {
-    "declare": "node scripts/declare.js src/index.ts",
-    "build": "webpack",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "dev": "webpack -w",
-    "watch": "webpack --watch"
-  },
-  "author": "MrKwon",
-  "license": "ISC",
-  "devDependencies": {
-    "ts-loader": "^4.0.0",
-    "webpack": "^4.1.0",
-    "webpack-cli": "^3.3.2",
-    "typescript": "^2.7.2",
-    "uglifyjs-webpack-plugin": "^2.1.2"
-  },
-  "keywords": [
-    "淘宝小程序，canvas，webgl"
-  ]
->>>>>>> b14a95c820b417eba6decc2ecbcf5732fa698cb4
 }