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

egret/libs/new_wx/MainBase.ts

@@ -450,7 +450,8 @@ export default class MainBase extends eui.UILayer {
                 "ele33_1",
                 "ele33_0",
                 "arrowbg",
-            ]
+                "gameGuide",
+            ];
             for (var i = 0; i < arr.length; i++) {
                 RES.getResAsync(arr[i] + "_png")
             }

egret/resource/skins/ShareCodePanelSkin.exml

@@ -44,12 +44,12 @@
 			</e:Button>
 		</e:Group>
 	</e:Group>
-	<e:Group id="panelGroup" horizontalCenter="0" visible="false">
+	<e:Group id="panelGroup" horizontalCenter="0">
 		<e:Rect width="750" height="1624" fillAlpha="0.7"/>
 		<e:Image y="294" source="copyCodeBg_png" horizontalCenter="0.5"/>
-		<e:Label id="msg" text="" lineSpacing="10" size="32" multiline="true" y="613" textColor="0xf54500" fontFamily="FZY4JW" horizontalCenter="3.5" textAlign="center"/>
-		<e:Image id="goBtn" y="682" horizontalCenter="0" source="zhantiegeihaoyou_png"/>
-		<e:Button id="closeBtn" label="" x="625" y="291">
+		<e:Label id="msg" text="" lineSpacing="10" size="32" multiline="true" y="640.27" fontFamily="FZY4JW" horizontalCenter="12.5" textAlign="center" textColor="0xbd6735"/>
+		<e:Image id="goBtn" y="718.48" horizontalCenter="0" source="zhantiegeihaoyou_png"/>
+		<e:Button id="closeBtn" label="" x="606.81" y="291">
 			<e:skinName>
 			<e:Skin states="up,down,disabled">
 				<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>

egret/src/mainScene/MainScene.ts

@@ -3074,13 +3074,14 @@ export default class MainScene extends Scene {
             }
 
                 //下面带状态的要优先判断
+            else if(ele.hasState(StateType.BLOCK_LOCK)) {
+                //这里不需要消除石门上的元素的状态，石门上的元素状态只由石门来修改
+            }
             //有枷锁的
             else if(ele.hasState(StateType.LOCK)) {
                 //被禁锢的解开
                 ele.setState(StateType.LOCK, false);
                 //暂时笼子不算个数，算的话，改图片名称，列入ElementType的状态下
-            } else if(ele.hasState(StateType.BLOCK_LOCK)) {
-                //这里不需要消除石门上的元素的状态，石门上的元素状态只由石门来修改
             }  else if(ele.hasState(StateType.HONEY)) {
                 ele.setState(StateType.HONEY, false);
                 createHoneyDisAni(ele.x, ele.y, this)

egret/src/panels/FriendPanel.ts

@@ -13,6 +13,7 @@ export default class FriendPanel extends Panel {
     public list: eui.List;
     progress: eui.Label;
     score: eui.Label;
+    rank = 1;
     start(data) {
         super.start();
         this.showlog();

egret/src/something/chapters/Chapter23.ts

@@ -160,6 +160,16 @@ export const Chapters23: ChapterData[] = [
  0, 3, 3, 3, 3, 3, 3, 3, 0,
  3, 3, 3, 3, 3, 3, 3, 3, 3 ], connectedLats: [], conveyor: [ [ 29, 33 ] ], conveyorConnectedLats: [ [ 33, 29 ] ], elements: [ 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, 1, 1, 14, 14, 14, 14, 14, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1 ], 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, 10, 30, 40, 50, 50, 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: 0, type: null }, { 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 }, { index: 8, type: null }, { index: 56, type: null }, { index: 57, type: null }, { index: 58, type: null }, { index: 59, type: null }, { index: 60, type: null }, { index: 29, type: null }, { index: 30, type: null }, { index: 31, type: null }, { index: 32, type: null }, { index: 33, type: null } ] } },
    //600
-   { baseElementTypes: [ 0, 1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 22, passTarget: { type: 1, elements: [ { type: 36, count: 67 } ] }, starScores: [], map: { lattices: [ 7, 7, 7, 7, 7, 7, 7, 0, 0, 7, 7, 7, 7, 7, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 7, 7, 7, 7, 7, 0, 0, 7, 7, 7, 7, 7, 7, 7 ], connectedLats: [ [ 74, 4 ], [ 75, 5 ], [ 76, 6 ] ], conveyor: [ [ 37, 43 ], [ 80, 74 ] ], conveyorConnectedLats: [ [ 43, 37 ], [ 74, 80 ] ], elements: [ 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 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, 1, 1, 1, 1, 2, 2, 2, 2, 2, 1, 1, 1, 1, 2, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 12 ], 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: 0, type: null }, { index: 1, type: null }, { index: 2, type: null }, { index: 3, type: null }, { index: 23, type: null }, { index: 24, type: null }, { index: 25, type: null }, { index: 26, type: null } ] } }
+   { baseElementTypes: [ 0,1, 2, 3, 4 ], bubbleProbability: 0, stepCount: 22, passTarget: { type: 1, elements: [ { type: 34, count: 25 } ] }, starScores: [ 15000, 20000, 25000 ], map: { lattices: [ 
+    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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 4, 41, 4, 41, 4, 41, 4, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1 ], connectedLats: [], conveyor: [], conveyorConnectedLats: [], elements: [ 
+    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,
+     1, 1, 1, 1, 1, 1, 1, 1, 1,
+     1, 1, 1, 1, 1, 1, 1, 1, 1,
+     1, 4, 4, 4, 4, 4, 4, 4, 1,
+     1, 1, 0, 0, 0, 0, 0, 1, 1,
+     1, 0, 0, 0, 0, 0, 0, 0, 1,
+     0, 0, 16, 16, 16, 16, 16, 0, 0 ], 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: 0, type: null }, { 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 }, { index: 8, type: null } ] } }
   
   ]