去掉水稻的免费送到家牌子

.idea/workspace.xml

@@ -46,10 +46,8 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="91d65b22-e37e-4b17-b43e-cdc81b9fe6ff" name="Default Changelist" comment="Default Changelist">
+    <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/skins/Objs/OptionPanelSkin.exml" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/skins/Objs/OptionPanelSkin.exml" 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/ShopPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/ShopPanel.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/egret/src/Panels/WareHousePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/WareHousePanel.ts" afterDir="false" />
     </list>
@@ -128,7 +126,7 @@
       <recent name="$PROJECT_DIR$/egret" />
     </key>
   </component>
-  <component name="RunManager" selected="npm.build">
+  <component name="RunManager" selected="npm.dev">
     <configuration name="banner.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/JoyousManor/banner.html" useBuiltInWebServerPort="true">
       <method v="2" />
     </configuration>
@@ -174,8 +172,8 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="npm.build" />
         <item itemvalue="npm.dev" />
+        <item itemvalue="npm.build" />
         <item itemvalue="npm.buildTS" />
         <item itemvalue="npm.buildExml" />
       </list>
@@ -306,14 +304,8 @@
       <workItem from="1616141373483" duration="666000" />
       <workItem from="1616650815558" duration="236000" />
       <workItem from="1616726563592" duration="2909000" />
-      <workItem from="1617241624365" duration="1050000" />
-    </task>
-    <task id="LOCAL-00009" summary="更新">
-      <created>1603800411862</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1603800411862</updated>
+      <workItem from="1617241624365" duration="1077000" />
+      <workItem from="1617791003651" duration="156000" />
     </task>
     <task id="LOCAL-00010" summary="新人刷新道具">
       <created>1603852314464</created>
@@ -651,7 +643,14 @@
       <option name="project" value="LOCAL" />
       <updated>1616833513577</updated>
     </task>
-    <option name="localTasksCounter" value="58" />
+    <task id="LOCAL-00058" summary="去掉鸡的免费送到家牌子">
+      <created>1617242693074</created>
+      <option name="number" value="00058" />
+      <option name="presentableId" value="LOCAL-00058" />
+      <option name="project" value="LOCAL" />
+      <updated>1617242693075</updated>
+    </task>
+    <option name="localTasksCounter" value="59" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -696,6 +695,7 @@
     <MESSAGE value="1" />
     <MESSAGE value="小e" />
     <MESSAGE value="Default Changelist" />
-    <option name="LAST_COMMIT_MESSAGE" value="Default Changelist" />
+    <MESSAGE value="去掉鸡的免费送到家牌子" />
+    <option name="LAST_COMMIT_MESSAGE" value="去掉鸡的免费送到家牌子" />
   </component>
 </project>
\ No newline at end of file

egret/resource/skins/Objs/OptionPanelSkin.exml

@@ -8,7 +8,7 @@
 	<e:Image id="cattleBtn" source="option_cattle_png" anchorOffsetX="48.5" anchorOffsetY="58.5" x="298" bottom="235"/>
 	<e:Image id="cornBtn" source="option_corn_png" x="460" anchorOffsetX="47.5" anchorOffsetY="65" bottom="235"/>
 	<e:Group id="wheatBtn" x="23" y="204" touchChildren="false">
-		<e:Image source="免费邮寄到家_png" x="-4" y="-2"/>
+		<e:Image source="免费邮寄到家_png" x="-4" y="-2" visible="false"/>
 		<e:Image source="option_wheat_png" anchorOffsetX="43" anchorOffsetY="59" x="90.5" y="76"/>
 	</e:Group>
 	<e:Image id="walnutBtn" anchorOffsetX="43" anchorOffsetY="59" source="option_walnut_png" horizontalCenter="155" verticalCenter="89" locked="true"/>

egret/src/Panels/ShopPanel.ts

@@ -261,7 +261,7 @@ class ShopItem extends Component {
         this.img.source = `prop_${data.key}_png`;
         // chicken wheat
         // this.tipImg.visible = (data.key == 'chicken' || data.key == 'wheat');
-        this.tipImg.visible = (data.key == 'wheat');
+        this.tipImg.visible = false//(data.key == 'wheat');
         this.nameTxt.text = data.name;
         this.tipTxt.text = `购买价格：${data.price}欢趣豆`;
         this.setNum(0);

egret/src/Panels/WareHousePanel.ts

@@ -406,7 +406,7 @@ class WareHouseSeed extends Component {
         this.img.source = `prop_${data.name}_png`;
         this.nameTxt.text = data.nameLabel;
         // this.tipImg.visible = (data.name == 'chicken' || data.name == 'wheat');
-        this.tipImg.visible = (data.name == 'wheat');
+        this.tipImg.visible = false;//(data.name == 'wheat');
         this.updateUI();
 
     }