枚举修改和后端一致

0bb2e710 · haiyoucuv · e8e4d56c · 0bb2e710 · e8e4d56c · 0bb2e710
Commit 0bb2e710 authored Jun 09, 2020 by haiyoucuv
187 changed files
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -441,7 +441,7 @@
      <recent name="$PROJECT_DIR$/resource/wareHouse" />
    </key>
  </component>
-  <component name="RunManager" selected="npm.handleRes">
+  <component name="RunManager" selected="npm.dev">
    <configuration name="dev" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
      <package-json value="$PROJECT_DIR$/package.json" />
      <command value="run" />

--- a/resource/Chestnut_1/Chestnut_1_0.png
+++ b/resource/Chestnut_1/Chestnut_1_0.png
--- a/resource/Chestnut_1/Chestnut_1_1.png
+++ b/resource/Chestnut_1/Chestnut_1_1.png
--- a/resource/Chestnut_1/Chestnut_1_10.png
+++ b/resource/Chestnut_1/Chestnut_1_10.png
--- a/resource/Chestnut_1/Chestnut_1_11.png
+++ b/resource/Chestnut_1/Chestnut_1_11.png
--- a/resource/Chestnut_1/Chestnut_1_12.png
+++ b/resource/Chestnut_1/Chestnut_1_12.png
--- a/resource/Chestnut_1/Chestnut_1_13.png
+++ b/resource/Chestnut_1/Chestnut_1_13.png
--- a/resource/Chestnut_1/Chestnut_1_14.png
+++ b/resource/Chestnut_1/Chestnut_1_14.png
--- a/resource/Chestnut_1/Chestnut_1_15.png
+++ b/resource/Chestnut_1/Chestnut_1_15.png
--- a/resource/Chestnut_1/Chestnut_1_16.png
+++ b/resource/Chestnut_1/Chestnut_1_16.png
--- a/resource/Chestnut_1/Chestnut_1_17.png
+++ b/resource/Chestnut_1/Chestnut_1_17.png
--- a/resource/Chestnut_1/Chestnut_1_18.png
+++ b/resource/Chestnut_1/Chestnut_1_18.png
--- a/resource/Chestnut_1/Chestnut_1_19.png
+++ b/resource/Chestnut_1/Chestnut_1_19.png
--- a/resource/Chestnut_1/Chestnut_1_2.png
+++ b/resource/Chestnut_1/Chestnut_1_2.png
--- a/resource/Chestnut_1/Chestnut_1_20.png
+++ b/resource/Chestnut_1/Chestnut_1_20.png
--- a/resource/Chestnut_1/Chestnut_1_21.png
+++ b/resource/Chestnut_1/Chestnut_1_21.png
--- a/resource/Chestnut_1/Chestnut_1_22.png
+++ b/resource/Chestnut_1/Chestnut_1_22.png
--- a/resource/Chestnut_1/Chestnut_1_23.png
+++ b/resource/Chestnut_1/Chestnut_1_23.png
--- a/resource/Chestnut_1/Chestnut_1_24.png
+++ b/resource/Chestnut_1/Chestnut_1_24.png
--- a/resource/Chestnut_1/Chestnut_1_25.png
+++ b/resource/Chestnut_1/Chestnut_1_25.png
--- a/resource/Chestnut_1/Chestnut_1_26.png
+++ b/resource/Chestnut_1/Chestnut_1_26.png
--- a/resource/Chestnut_1/Chestnut_1_27.png
+++ b/resource/Chestnut_1/Chestnut_1_27.png
--- a/resource/Chestnut_1/Chestnut_1_28.png
+++ b/resource/Chestnut_1/Chestnut_1_28.png
--- a/resource/Chestnut_1/Chestnut_1_29.png
+++ b/resource/Chestnut_1/Chestnut_1_29.png
--- a/resource/Chestnut_1/Chestnut_1_3.png
+++ b/resource/Chestnut_1/Chestnut_1_3.png
--- a/resource/Chestnut_1/Chestnut_1_30.png
+++ b/resource/Chestnut_1/Chestnut_1_30.png
--- a/resource/Chestnut_1/Chestnut_1_4.png
+++ b/resource/Chestnut_1/Chestnut_1_4.png
--- a/resource/Chestnut_1/Chestnut_1_5.png
+++ b/resource/Chestnut_1/Chestnut_1_5.png
--- a/resource/Chestnut_1/Chestnut_1_6.png
+++ b/resource/Chestnut_1/Chestnut_1_6.png
--- a/resource/Chestnut_1/Chestnut_1_7.png
+++ b/resource/Chestnut_1/Chestnut_1_7.png
--- a/resource/Chestnut_1/Chestnut_1_8.png
+++ b/resource/Chestnut_1/Chestnut_1_8.png
--- a/resource/Chestnut_1/Chestnut_1_9.png
+++ b/resource/Chestnut_1/Chestnut_1_9.png
--- a/resource/Chestnut_2/Chestnut_2_0.png
+++ b/resource/Chestnut_2/Chestnut_2_0.png
--- a/resource/Chestnut_2/Chestnut_2_1.png
+++ b/resource/Chestnut_2/Chestnut_2_1.png
--- a/resource/Chestnut_2/Chestnut_2_10.png
+++ b/resource/Chestnut_2/Chestnut_2_10.png
--- a/resource/Chestnut_2/Chestnut_2_11.png
+++ b/resource/Chestnut_2/Chestnut_2_11.png
--- a/resource/Chestnut_2/Chestnut_2_12.png
+++ b/resource/Chestnut_2/Chestnut_2_12.png
--- a/resource/Chestnut_2/Chestnut_2_13.png
+++ b/resource/Chestnut_2/Chestnut_2_13.png
--- a/resource/Chestnut_2/Chestnut_2_14.png
+++ b/resource/Chestnut_2/Chestnut_2_14.png
--- a/resource/Chestnut_2/Chestnut_2_15.png
+++ b/resource/Chestnut_2/Chestnut_2_15.png
--- a/resource/Chestnut_2/Chestnut_2_16.png
+++ b/resource/Chestnut_2/Chestnut_2_16.png
--- a/resource/Chestnut_2/Chestnut_2_17.png
+++ b/resource/Chestnut_2/Chestnut_2_17.png
--- a/resource/Chestnut_2/Chestnut_2_18.png
+++ b/resource/Chestnut_2/Chestnut_2_18.png
--- a/resource/Chestnut_2/Chestnut_2_19.png
+++ b/resource/Chestnut_2/Chestnut_2_19.png
--- a/resource/Chestnut_2/Chestnut_2_2.png
+++ b/resource/Chestnut_2/Chestnut_2_2.png
--- a/resource/Chestnut_2/Chestnut_2_20.png
+++ b/resource/Chestnut_2/Chestnut_2_20.png
--- a/resource/Chestnut_2/Chestnut_2_21.png
+++ b/resource/Chestnut_2/Chestnut_2_21.png
--- a/resource/Chestnut_2/Chestnut_2_22.png
+++ b/resource/Chestnut_2/Chestnut_2_22.png
--- a/resource/Chestnut_2/Chestnut_2_23.png
+++ b/resource/Chestnut_2/Chestnut_2_23.png
--- a/resource/Chestnut_2/Chestnut_2_24.png
+++ b/resource/Chestnut_2/Chestnut_2_24.png
--- a/resource/Chestnut_2/Chestnut_2_25.png
+++ b/resource/Chestnut_2/Chestnut_2_25.png
--- a/resource/Chestnut_2/Chestnut_2_26.png
+++ b/resource/Chestnut_2/Chestnut_2_26.png
--- a/resource/Chestnut_2/Chestnut_2_27.png
+++ b/resource/Chestnut_2/Chestnut_2_27.png
--- a/resource/Chestnut_2/Chestnut_2_28.png
+++ b/resource/Chestnut_2/Chestnut_2_28.png
--- a/resource/Chestnut_2/Chestnut_2_29.png
+++ b/resource/Chestnut_2/Chestnut_2_29.png
--- a/resource/Chestnut_2/Chestnut_2_3.png
+++ b/resource/Chestnut_2/Chestnut_2_3.png
--- a/resource/Chestnut_2/Chestnut_2_30.png
+++ b/resource/Chestnut_2/Chestnut_2_30.png
--- a/resource/Chestnut_2/Chestnut_2_4.png
+++ b/resource/Chestnut_2/Chestnut_2_4.png
--- a/resource/Chestnut_2/Chestnut_2_5.png
+++ b/resource/Chestnut_2/Chestnut_2_5.png
--- a/resource/Chestnut_2/Chestnut_2_6.png
+++ b/resource/Chestnut_2/Chestnut_2_6.png
--- a/resource/Chestnut_2/Chestnut_2_7.png
+++ b/resource/Chestnut_2/Chestnut_2_7.png
--- a/resource/Chestnut_2/Chestnut_2_8.png
+++ b/resource/Chestnut_2/Chestnut_2_8.png
--- a/resource/Chestnut_2/Chestnut_2_9.png
+++ b/resource/Chestnut_2/Chestnut_2_9.png
--- a/resource/Peanut_1/Peanut_1_0.png
+++ b/resource/Peanut_1/Peanut_1_0.png
--- a/resource/Peanut_1/Peanut_1_1.png
+++ b/resource/Peanut_1/Peanut_1_1.png
--- a/resource/Peanut_1/Peanut_1_10.png
+++ b/resource/Peanut_1/Peanut_1_10.png
--- a/resource/Peanut_1/Peanut_1_11.png
+++ b/resource/Peanut_1/Peanut_1_11.png
--- a/resource/Peanut_1/Peanut_1_12.png
+++ b/resource/Peanut_1/Peanut_1_12.png
--- a/resource/Peanut_1/Peanut_1_13.png
+++ b/resource/Peanut_1/Peanut_1_13.png
--- a/resource/Peanut_1/Peanut_1_14.png
+++ b/resource/Peanut_1/Peanut_1_14.png
--- a/resource/Peanut_1/Peanut_1_15.png
+++ b/resource/Peanut_1/Peanut_1_15.png
--- a/resource/Peanut_1/Peanut_1_16.png
+++ b/resource/Peanut_1/Peanut_1_16.png
--- a/resource/Peanut_1/Peanut_1_17.png
+++ b/resource/Peanut_1/Peanut_1_17.png
--- a/resource/Peanut_1/Peanut_1_18.png
+++ b/resource/Peanut_1/Peanut_1_18.png
--- a/resource/Peanut_1/Peanut_1_19.png
+++ b/resource/Peanut_1/Peanut_1_19.png
--- a/resource/Peanut_1/Peanut_1_2.png
+++ b/resource/Peanut_1/Peanut_1_2.png
--- a/resource/Peanut_1/Peanut_1_20.png
+++ b/resource/Peanut_1/Peanut_1_20.png
--- a/resource/Peanut_1/Peanut_1_21.png
+++ b/resource/Peanut_1/Peanut_1_21.png
--- a/resource/Peanut_1/Peanut_1_22.png
+++ b/resource/Peanut_1/Peanut_1_22.png
--- a/resource/Peanut_1/Peanut_1_23.png
+++ b/resource/Peanut_1/Peanut_1_23.png
--- a/resource/Peanut_1/Peanut_1_24.png
+++ b/resource/Peanut_1/Peanut_1_24.png
--- a/resource/Peanut_1/Peanut_1_25.png
+++ b/resource/Peanut_1/Peanut_1_25.png
--- a/resource/Peanut_1/Peanut_1_26.png
+++ b/resource/Peanut_1/Peanut_1_26.png
--- a/resource/Peanut_1/Peanut_1_27.png
+++ b/resource/Peanut_1/Peanut_1_27.png
--- a/resource/Peanut_1/Peanut_1_28.png
+++ b/resource/Peanut_1/Peanut_1_28.png
--- a/resource/Peanut_1/Peanut_1_29.png
+++ b/resource/Peanut_1/Peanut_1_29.png
--- a/resource/Peanut_1/Peanut_1_3.png
+++ b/resource/Peanut_1/Peanut_1_3.png
--- a/resource/Peanut_1/Peanut_1_30.png
+++ b/resource/Peanut_1/Peanut_1_30.png
--- a/resource/Peanut_1/Peanut_1_4.png
+++ b/resource/Peanut_1/Peanut_1_4.png
--- a/resource/Peanut_1/Peanut_1_5.png
+++ b/resource/Peanut_1/Peanut_1_5.png
--- a/resource/Peanut_1/Peanut_1_6.png
+++ b/resource/Peanut_1/Peanut_1_6.png
--- a/resource/Peanut_1/Peanut_1_7.png
+++ b/resource/Peanut_1/Peanut_1_7.png
--- a/resource/Peanut_1/Peanut_1_8.png
+++ b/resource/Peanut_1/Peanut_1_8.png
--- a/resource/Peanut_1/Peanut_1_9.png
+++ b/resource/Peanut_1/Peanut_1_9.png
--- a/resource/Peanut_2/Peanut_2_0.png
+++ b/resource/Peanut_2/Peanut_2_0.png
--- a/resource/Peanut_2/Peanut_2_1.png
+++ b/resource/Peanut_2/Peanut_2_1.png
--- a/resource/Peanut_2/Peanut_2_10.png
+++ b/resource/Peanut_2/Peanut_2_10.png
--- a/resource/Peanut_2/Peanut_2_11.png
+++ b/resource/Peanut_2/Peanut_2_11.png
--- a/resource/Peanut_2/Peanut_2_12.png
+++ b/resource/Peanut_2/Peanut_2_12.png
--- a/resource/Peanut_2/Peanut_2_13.png
+++ b/resource/Peanut_2/Peanut_2_13.png
--- a/resource/Peanut_2/Peanut_2_14.png
+++ b/resource/Peanut_2/Peanut_2_14.png
--- a/resource/Peanut_2/Peanut_2_15.png
+++ b/resource/Peanut_2/Peanut_2_15.png
--- a/resource/Peanut_2/Peanut_2_16.png
+++ b/resource/Peanut_2/Peanut_2_16.png
--- a/resource/Peanut_2/Peanut_2_17.png
+++ b/resource/Peanut_2/Peanut_2_17.png
--- a/resource/Peanut_2/Peanut_2_18.png
+++ b/resource/Peanut_2/Peanut_2_18.png
--- a/resource/Peanut_2/Peanut_2_19.png
+++ b/resource/Peanut_2/Peanut_2_19.png
--- a/resource/Peanut_2/Peanut_2_2.png
+++ b/resource/Peanut_2/Peanut_2_2.png
--- a/resource/Peanut_2/Peanut_2_20.png
+++ b/resource/Peanut_2/Peanut_2_20.png
--- a/resource/Peanut_2/Peanut_2_21.png
+++ b/resource/Peanut_2/Peanut_2_21.png
--- a/resource/Peanut_2/Peanut_2_22.png
+++ b/resource/Peanut_2/Peanut_2_22.png
--- a/resource/Peanut_2/Peanut_2_23.png
+++ b/resource/Peanut_2/Peanut_2_23.png
--- a/resource/Peanut_2/Peanut_2_24.png
+++ b/resource/Peanut_2/Peanut_2_24.png
--- a/resource/Peanut_2/Peanut_2_25.png
+++ b/resource/Peanut_2/Peanut_2_25.png
--- a/resource/Peanut_2/Peanut_2_26.png
+++ b/resource/Peanut_2/Peanut_2_26.png
--- a/resource/Peanut_2/Peanut_2_27.png
+++ b/resource/Peanut_2/Peanut_2_27.png
--- a/resource/Peanut_2/Peanut_2_28.png
+++ b/resource/Peanut_2/Peanut_2_28.png
--- a/resource/Peanut_2/Peanut_2_29.png
+++ b/resource/Peanut_2/Peanut_2_29.png
--- a/resource/Peanut_2/Peanut_2_3.png
+++ b/resource/Peanut_2/Peanut_2_3.png
--- a/resource/Peanut_2/Peanut_2_30.png
+++ b/resource/Peanut_2/Peanut_2_30.png
--- a/resource/Peanut_2/Peanut_2_4.png
+++ b/resource/Peanut_2/Peanut_2_4.png
--- a/resource/Peanut_2/Peanut_2_5.png
+++ b/resource/Peanut_2/Peanut_2_5.png
--- a/resource/Peanut_2/Peanut_2_6.png
+++ b/resource/Peanut_2/Peanut_2_6.png
--- a/resource/Peanut_2/Peanut_2_7.png
+++ b/resource/Peanut_2/Peanut_2_7.png
--- a/resource/Peanut_2/Peanut_2_8.png
+++ b/resource/Peanut_2/Peanut_2_8.png
--- a/resource/Peanut_2/Peanut_2_9.png
+++ b/resource/Peanut_2/Peanut_2_9.png
--- a/resource/Pecan_1/Pecan_1_0.png
+++ b/resource/Pecan_1/Pecan_1_0.png
--- a/resource/Pecan_1/Pecan_1_1.png
+++ b/resource/Pecan_1/Pecan_1_1.png
--- a/resource/Pecan_1/Pecan_1_10.png
+++ b/resource/Pecan_1/Pecan_1_10.png
--- a/resource/Pecan_1/Pecan_1_11.png
+++ b/resource/Pecan_1/Pecan_1_11.png
--- a/resource/Pecan_1/Pecan_1_12.png
+++ b/resource/Pecan_1/Pecan_1_12.png
--- a/resource/Pecan_1/Pecan_1_13.png
+++ b/resource/Pecan_1/Pecan_1_13.png
--- a/resource/Pecan_1/Pecan_1_14.png
+++ b/resource/Pecan_1/Pecan_1_14.png
--- a/resource/Pecan_1/Pecan_1_15.png
+++ b/resource/Pecan_1/Pecan_1_15.png
--- a/resource/Pecan_1/Pecan_1_16.png
+++ b/resource/Pecan_1/Pecan_1_16.png
--- a/resource/Pecan_1/Pecan_1_17.png
+++ b/resource/Pecan_1/Pecan_1_17.png
--- a/resource/Pecan_1/Pecan_1_18.png
+++ b/resource/Pecan_1/Pecan_1_18.png
--- a/resource/Pecan_1/Pecan_1_19.png
+++ b/resource/Pecan_1/Pecan_1_19.png
--- a/resource/Pecan_1/Pecan_1_2.png
+++ b/resource/Pecan_1/Pecan_1_2.png
--- a/resource/Pecan_1/Pecan_1_20.png
+++ b/resource/Pecan_1/Pecan_1_20.png
--- a/resource/Pecan_1/Pecan_1_21.png
+++ b/resource/Pecan_1/Pecan_1_21.png
--- a/resource/Pecan_1/Pecan_1_22.png
+++ b/resource/Pecan_1/Pecan_1_22.png
--- a/resource/Pecan_1/Pecan_1_23.png
+++ b/resource/Pecan_1/Pecan_1_23.png
--- a/resource/Pecan_1/Pecan_1_24.png
+++ b/resource/Pecan_1/Pecan_1_24.png
--- a/resource/Pecan_1/Pecan_1_25.png
+++ b/resource/Pecan_1/Pecan_1_25.png
--- a/resource/Pecan_1/Pecan_1_26.png
+++ b/resource/Pecan_1/Pecan_1_26.png
--- a/resource/Pecan_1/Pecan_1_27.png
+++ b/resource/Pecan_1/Pecan_1_27.png
--- a/resource/Pecan_1/Pecan_1_28.png
+++ b/resource/Pecan_1/Pecan_1_28.png
--- a/resource/Pecan_1/Pecan_1_29.png
+++ b/resource/Pecan_1/Pecan_1_29.png
--- a/resource/Pecan_1/Pecan_1_3.png
+++ b/resource/Pecan_1/Pecan_1_3.png
--- a/resource/Pecan_1/Pecan_1_30.png
+++ b/resource/Pecan_1/Pecan_1_30.png
--- a/resource/Pecan_1/Pecan_1_4.png
+++ b/resource/Pecan_1/Pecan_1_4.png
--- a/resource/Pecan_1/Pecan_1_5.png
+++ b/resource/Pecan_1/Pecan_1_5.png
--- a/resource/Pecan_1/Pecan_1_6.png
+++ b/resource/Pecan_1/Pecan_1_6.png
--- a/resource/Pecan_1/Pecan_1_7.png
+++ b/resource/Pecan_1/Pecan_1_7.png
--- a/resource/Pecan_1/Pecan_1_8.png
+++ b/resource/Pecan_1/Pecan_1_8.png
--- a/resource/Pecan_1/Pecan_1_9.png
+++ b/resource/Pecan_1/Pecan_1_9.png
--- a/resource/Pecan_2/Pecan_2_0.png
+++ b/resource/Pecan_2/Pecan_2_0.png
--- a/resource/Pecan_2/Pecan_2_1.png
+++ b/resource/Pecan_2/Pecan_2_1.png
--- a/resource/Pecan_2/Pecan_2_10.png
+++ b/resource/Pecan_2/Pecan_2_10.png
--- a/resource/Pecan_2/Pecan_2_11.png
+++ b/resource/Pecan_2/Pecan_2_11.png
--- a/resource/Pecan_2/Pecan_2_12.png
+++ b/resource/Pecan_2/Pecan_2_12.png
--- a/resource/Pecan_2/Pecan_2_13.png
+++ b/resource/Pecan_2/Pecan_2_13.png
--- a/resource/Pecan_2/Pecan_2_14.png
+++ b/resource/Pecan_2/Pecan_2_14.png
--- a/resource/Pecan_2/Pecan_2_15.png
+++ b/resource/Pecan_2/Pecan_2_15.png
--- a/resource/Pecan_2/Pecan_2_16.png
+++ b/resource/Pecan_2/Pecan_2_16.png
--- a/resource/Pecan_2/Pecan_2_17.png
+++ b/resource/Pecan_2/Pecan_2_17.png
--- a/resource/Pecan_2/Pecan_2_18.png
+++ b/resource/Pecan_2/Pecan_2_18.png
--- a/resource/Pecan_2/Pecan_2_19.png
+++ b/resource/Pecan_2/Pecan_2_19.png
--- a/resource/Pecan_2/Pecan_2_2.png
+++ b/resource/Pecan_2/Pecan_2_2.png
--- a/resource/Pecan_2/Pecan_2_20.png
+++ b/resource/Pecan_2/Pecan_2_20.png
--- a/resource/Pecan_2/Pecan_2_21.png
+++ b/resource/Pecan_2/Pecan_2_21.png
--- a/resource/Pecan_2/Pecan_2_22.png
+++ b/resource/Pecan_2/Pecan_2_22.png
--- a/resource/Pecan_2/Pecan_2_23.png
+++ b/resource/Pecan_2/Pecan_2_23.png
--- a/resource/Pecan_2/Pecan_2_24.png
+++ b/resource/Pecan_2/Pecan_2_24.png
--- a/resource/Pecan_2/Pecan_2_25.png
+++ b/resource/Pecan_2/Pecan_2_25.png
--- a/resource/Pecan_2/Pecan_2_26.png
+++ b/resource/Pecan_2/Pecan_2_26.png
--- a/resource/Pecan_2/Pecan_2_27.png
+++ b/resource/Pecan_2/Pecan_2_27.png
--- a/resource/Pecan_2/Pecan_2_28.png
+++ b/resource/Pecan_2/Pecan_2_28.png
--- a/resource/Pecan_2/Pecan_2_29.png
+++ b/resource/Pecan_2/Pecan_2_29.png
--- a/resource/Pecan_2/Pecan_2_3.png
+++ b/resource/Pecan_2/Pecan_2_3.png
--- a/resource/Pecan_2/Pecan_2_30.png
+++ b/resource/Pecan_2/Pecan_2_30.png
--- a/resource/Pecan_2/Pecan_2_4.png
+++ b/resource/Pecan_2/Pecan_2_4.png
--- a/resource/Pecan_2/Pecan_2_5.png
+++ b/resource/Pecan_2/Pecan_2_5.png
--- a/resource/Pecan_2/Pecan_2_6.png
+++ b/resource/Pecan_2/Pecan_2_6.png
--- a/resource/Pecan_2/Pecan_2_7.png
+++ b/resource/Pecan_2/Pecan_2_7.png
--- a/resource/Pecan_2/Pecan_2_8.png
+++ b/resource/Pecan_2/Pecan_2_8.png
--- a/resource/Pecan_2/Pecan_2_9.png
+++ b/resource/Pecan_2/Pecan_2_9.png