Merge branch 'dev' of http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole into dev

egret/.wing/exml.json

@@ -10,7 +10,7 @@
     "globalBackgroundImage": "",
     "globalAutoLayerMarkEnable": false,
     "gridColor": 13238148,
-    "gridEnabled": true,
+    "gridEnabled": false,
     "gridSize": "50"
   },
   "1667fb18fa6": {

egret/index.html

@@ -19,7 +19,7 @@
             background-color: #000;
             background-size: 100%;
             background-position:center;
-            background-image: url("https://yun.duiba.com.cn/db_games/activity/game/02072/startscenebg.jpg");
+            background-image: url("https://yun.duiba.com.cn/db_games/activity/game/0217/startscenebg.jpg");
             /* background-image: url("https://yun.duiba.com.cn/db_games/activity/game/1565600901/resource/assets/startScene/startscenebg.jpg"); */
             padding: 0;
             border: 0;

egret/resource/skins/StartSkin.exml

@@ -4,8 +4,8 @@
 	<e:Label id="FZY3JW" text=" " y="1048" textColor="0x244B00" fontFamily="FZY3JW" horizontalCenter="0" visible="false"/>
 	<e:Label id="FZY4JW" text=" " y="1048" textColor="0x244B00" fontFamily="FZY4JW" horizontalCenter="0" visible="false"/>
 	<e:Component id="bg" width="750" height="1624" verticalCenter="0" visible="false"/>
-	<e:Component id="container2" x="0" width="750" height="1624" y="0" visible="false"/>
-	<e:Component id="container1" x="0" width="750" height="1624" visible="false"/>
+	<e:Component id="container2" x="0" width="750" height="1624" verticalCenter="0"/>
+	<e:Component id="container1" x="0" width="750" height="1624" verticalCenter="235"/>
 	<e:Group width="750" x="0" verticalCenter="494">
 		<e:Group y="30.94" x="140">
 			<e:Image source="loadingbg_png" y="0" x="0"/>

egret/src/something/enum/ElementType.ts

@@ -54,6 +54,8 @@ export enum ElementType {
     MONSTER_PIG,
     
     FISH,//气鼓鱼
+    // 蜂蜜
+    // BEE,//气鼓鱼
 }
 
 export const isMonsterEle = (t: ElementType) => {