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

egret/resource/skins/BloodSkin.exml

@@ -40,7 +40,7 @@
 	<e:Button id="inviteBtn2" label="" x="433" y="635">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
-			<e:Image width="100%" height="100%" source="blood去分享_png" source.down="blood按钮 副本1_png" source.disabled="blood按钮 副本1_png"/>
+			<e:Image width="100%" height="100%" source="blood去分享_png" source.down="blood去分享_png" source.disabled="blood去分享_png"/>
 			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 			</e:Skin>
 		</e:skinName>

egret/src/panels/BloodPanel.ts

@@ -87,7 +87,7 @@ export default class BloodPanel extends Panel {
         if (iswx()) {
             getShareUrl(this.stage);
         } else
-        showShare(1);
+            showShare(1);
         NetManager.ins.clickLog(getlogItem(4));
         const data = getHomeData();
         if (data.askForEnergy) {

egret/src/shareCtrl.ts

@@ -64,7 +64,8 @@ class Share2 extends ComponentBase {
             // img.src = base64;
             // img.src = data.data;
             if(this.type==1)
-                callShareApi('https://yun.duiba.com.cn/db_games/xxshareshare3.jpg', channel);
+                callShareApi('https://yun.duiba.com.cn/db_games/xxshareshare4.jpg', channel);
+                // callShareApi('https://yun.duiba.com.cn/db_games/xxshareshare3.jpg', channel);
             else
                 callShareApi('https://yun.duiba.com.cn/db_games/xxlshare.jpg', channel);
         // }, base64);

egret/src/something/chapters/Chapter4.ts

@@ -97,7 +97,63 @@ export const Chapters4: ChapterData[] = [
     },
     //66
     {
-        baseElementTypes: [0, 2, 3, 4], bubbleProbability: 0, stepCount: 34, passTarget: { type: 1, elements: [{ type: 1, count: 30 }, { type: 0, count: 50 }, { type: 2, count: 50 }] }, starScores: [6000, 12000, 24000], map: { lattices: [0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], connectedLats: [], elements: [0, 1, 1, 1, 1, 1, 1, 1, 0, 6, 1, 1, 1, 1, 1, 1, 1, 6, 6, 1, 1, 1, 1, 1, 1, 1, 6, 6, 1, 1, 1, 1, 1, 1, 1, 6, 0, 1, 1, 4, 4, 4, 1, 1, 0, 0, 1, 1, 4, 6, 4, 1, 1, 0, 6, 1, 1, 4, 4, 4, 1, 1, 6, 6, 1, 1, 1, 1, 1, 1, 1, 6, 6, 1, 1, 1, 1, 1, 1, 1, 6], baseElements: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], recycles: [], generateLats: [] }
+        baseElementTypes: [0, 2, 3, 4],
+        bubbleProbability: 0,
+        stepCount: 34,
+        passTarget: {
+            type: 1, elements: [
+                { type: 1, count: 30 },
+                { type: 0, count: 50 },
+                { type: 2, count: 50 }
+            ]
+        },
+        starScores: [6000, 12000, 24000],
+        map: {
+            lattices: [
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1
+            ],
+            connectedLats: [],
+            elements: [
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                6, 1, 1, 1, 1, 1, 1, 1, 6,
+                6, 1, 1, 1, 1, 1, 1, 1, 6,
+                6, 1, 1, 1, 1, 1, 1, 1, 6,
+                0, 1, 1, 4, 4, 4, 1, 1, 0,
+                0, 1, 1, 4, 6, 4, 1, 1, 0,
+                6, 1, 1, 4, 4, 4, 1, 1, 6,
+                6, 1, 1, 1, 1, 1, 1, 1, 6,
+                6, 1, 1, 1, 1, 1, 1, 1, 6
+            ],
+            baseElements: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0
+            ],
+            recycles: [],
+            generateLats: [
+                { index: 1, type: null },
+                { index: 2, type: null },
+                { index: 3, type: null },
+                { index: 4, type: null },
+                { index: 5, type: null },
+                { index: 6, type: null },
+                { index: 7, type: null },
+            ]
+        }
     },
     //67
     {