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

f9e698e6 · 邱旭 · 6ac1af1a · 98b3b89e · f9e698e6 · 6ac1af1a
Commit f9e698e6 authored Apr 02, 2020 by 邱旭
32 changed files
--- a/egret/libs/new_wx/components/Panel.ts
+++ b/egret/libs/new_wx/components/Panel.ts
@@ -28,11 +28,42 @@ export default class Panel extends ComponentBase {
        this.closeBtns.forEach(
            btn => { if (btn) btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap_closeBtn, this) }
        )
+
+
+        if(this['combglight']){
+            this['combglight'].visible = false;
+            
+            this.once(egret.Event.ADDED,()=>{
+                // setTimeout(() => {
+                    this['combglight'].visible = true;
+                    egret.Tween.get(this['combglight'], { loop: true }).to({ rotation: 360 }, 12000);
+                // }, 200)
+            },this);
+            
+            
+        }
+        if(this['combglight1']){
+            this['combglight1'].visible = false;
+            this.once(egret.Event.ADDED,()=>{
+                // setTimeout(() => {
+                    this['combglight1'].visible = true;
+                    egret.Tween.get(this['combglight1'], { loop: true }).to({ rotation: -360 }, 12000);
+                // },200)
+            },this)
+        }
    }
+    
    removeEvents() {
        this.closeBtns.forEach(
            btn => { if (btn) btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchTap_closeBtn, this) }
        )
+        
+        if(this['combglight']){
+            egret.Tween.removeTweens(this['combglight']);
+        }
+        if(this['combglight1']){
+            egret.Tween.removeTweens(this['combglight1']);
+        }
    }

    protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }

--- a/egret/resource/assets/shareCodePanel/copyCodeBg.png
+++ b/egret/resource/assets/shareCodePanel/copyCodeBg.png
--- a/egret/resource/assets/shareCodePanel/zhantiegeihaoyou.png
+++ b/egret/resource/assets/shareCodePanel/zhantiegeihaoyou.png
--- a/egret/resource/skins/ADSkin.exml
+++ b/egret/resource/skins/ADSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="AddSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16db3bd8eb8"/>
+	<e:Image id="combglight" source="combglight_png" y="476.19" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="476.19" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image source="adbg_png" y="-52.51" horizontalCenter="0"/>
 	<e:Image id="adBtn" y="437.49" width="504" height="536" source="{data.img}" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" y="308.88" horizontalCenter="275.5">

--- a/egret/resource/skins/BackSkin.exml
+++ b/egret/resource/skins/BackSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="BackSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16e0235c541"/>
+	<e:Image id="combglight" source="combglight_png" y="417.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="417.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image source="backbg_png" scale9Grid="93,550,564,42" y="-107" horizontalCenter="0"/>
 	<e:Image id="bg" source="commom_prop_bg_png" y="456.76" horizontalCenter="0"/>
 	<e:Image id="img" source="{data.url}" y="452.76" width="494" height="226" horizontalCenter="0"/>

--- a/egret/resource/skins/BagSkin.exml
+++ b/egret/resource/skins/BagSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="BagSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Image id="combglight" source="combglight_png" y="371.64" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="371.64" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image source="bagbg_png" horizontalCenter="0" verticalCenter="-71.5"/>
 	<e:Group id="group1" y="377" horizontalCenter="0" visible="false">
 		<e:Image source="bag我的道具_png" y="0" x="0"/>

--- a/egret/resource/skins/Buy1Skin.exml
+++ b/egret/resource/skins/Buy1Skin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="Buy1Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16c95475a4e"/>
+	<e:Image id="combglight" source="combglight_png" y="407.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="407.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image y="-62" source="购买锤子_png" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" x="608" y="289">
 		<e:skinName>

--- a/egret/resource/skins/Buy2Skin.exml
+++ b/egret/resource/skins/Buy2Skin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="Buy2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Image id="combglight" source="combglight_png" y="407.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="407.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image y="-62" horizontalCenter="0" source="购买炸弹_png"/>
 	<e:Button id="closeBtn" label="" x="597.39" y="278.7">
 		<e:skinName>

--- a/egret/resource/skins/Buy3Skin.exml
+++ b/egret/resource/skins/Buy3Skin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="Buy3Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16c984f7919"/>
+	<e:Image id="combglight" source="combglight_png" y="404.98" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="404.98" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image y="-62" horizontalCenter="0" source="购买步数增加_png"/>
 	<e:Button id="closeBtn" label="" x="592" y="289">
 		<e:skinName>

--- a/egret/resource/skins/FriendSkin.exml
+++ b/egret/resource/skins/FriendSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="FriendSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Image id="combglight" source="combglight_png" y="319.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="319.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image source="friendbg_png" y="48.29" horizontalCenter="2" locked="true"/>
 	<e:Label id="star" text="X0" x="588.96" y="366.08" size="24" fontFamily="FZY3JW"/>
 	<e:Button id="closeBtn" label="" x="634.94" y="239.98">

--- a/egret/resource/skins/HbCutTimeSkin.exml
+++ b/egret/resource/skins/HbCutTimeSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="InviteSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui"
        xmlns:w="http://ns.egret.com/wing">
+	<e:Image id="combglight" source="combglight_png" y="614.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="614.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image y="87.33" horizontalCenter="0" source="hbCutTime_bg_png"/>
 	<e:BitmapLabel id="cutTimeLabel" y="801.33" text="00时00分00秒" letterSpacing="8" horizontalCenter="10" font="hbCutTimeFont_fnt"/>
 	<e:Image id="tipImage" y="748" source="hbCutTime_cutLine_disable_png" horizontalCenter="0"/>

--- a/egret/resource/skins/HbPrizeSkin.exml
+++ b/egret/resource/skins/HbPrizeSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
        xmlns:w="http://ns.egret.com/wing">
+	<e:Image id="combglight" source="combglight_png" y="385.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="385.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image y="-145.5" source="hbPrize_bg_png" horizontalCenter="1"/>
 	<e:Image id="img" width="508" height="225" source="{data.url}" y="518.96" horizontalCenter="0"/>
 	<e:Image id="prop" scaleX="1" scaleY="1" horizontalCenter="-70.5" source="taskPrize_money_png" verticalCenter="15.5"/>

--- a/egret/resource/skins/InvitePrizePanelSkin.exml
+++ b/egret/resource/skins/InvitePrizePanelSkin.exml
@@ -2,6 +2,8 @@
 <e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
        xmlns:w="http://ns.egret.com/wing" xmlns:ns1="*">
 	<e:Component y="910" skinName="ADSmallSkin" anchorOffsetX="0" anchorOffsetY="0" horizontalCenter="0" visible="false"/>
+	<e:Image id="combglight" source="combglight_png" y="418.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="418.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image y="-108.73"  source="invitePrize_bg_png" horizontalCenter="0"/>
 	<e:Image id="prizeImg" y="455.77" source=""  horizontalCenter="0" width="510" height="228"/>
 	<e:Button id="closeBtn" label="" x="612" y="311.77">

--- a/egret/resource/skins/InviteSkin.exml
+++ b/egret/resource/skins/InviteSkin.exml
@@ -2,6 +2,8 @@
 <e:Skin class="InviteSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui"
        xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16dd8f58b77" visible="false"/>
+	<e:Image id="combglight" source="combglight_png" y="585.25" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="585.25" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image id="light2" source="invitebg2_png" x="376" y="317" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
 	<e:Image id="light1" source="invitebg2_png" x="376" y="317" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
 	<e:Image y="36.5" horizontalCenter="0" source="invite_bg_png"/>

--- a/egret/resource/skins/NoPrizeSkin.exml
+++ b/egret/resource/skins/NoPrizeSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="NoPrizeSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Image id="combglight" source="combglight_png" y="533.73" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="-3"/>
+	<e:Image id="combglight1" source="combglight_png" y="533.73" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="-3"/>
 	<e:Image id="light" source="common_prizelight_png" x="374.19" y="512.23" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
 	<e:Image y="17" source="擦肩而过弹窗 _png" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" x="596.48" y="436.72">

--- a/egret/resource/skins/Prize2Skin.exml
+++ b/egret/resource/skins/Prize2Skin.exml
@@ -2,6 +2,8 @@
 <e:Skin class="Prize2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="169005181d0"/>
 	<e:Component y="809.52" skinName="ADSmallSkin" x="84" visible="false"/>
+	<e:Image id="combglight" source="combglight_png" y="451.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="451.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image id="light" source="common_prizelight_png" x="376.19" y="598.89" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
 	<e:Image source="prizePanelbg_png" y="-73.38" horizontalCenter="2"/>
 	<e:Button id="closeBtn" label="" x="588" y="367.88">

--- a/egret/resource/skins/PrizeSkin.exml
+++ b/egret/resource/skins/PrizeSkin.exml
@@ -3,6 +3,8 @@
 	<w:Config id="169005181d0"/>
 	<e:Component y="1086.79" skinName="ADSmallSkin" x="68" visible="false"/>
 	<e:Image id="light" source="common_prizelight_png" x="374.19" y="253.76" anchorOffsetX="375.76" anchorOffsetY="327.27" visible="false"/>
+	<e:Image id="combglight" source="combglight_png" y="513.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="513.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image source="prizePanelbg_png" y="0" scale9Grid="87,543,522,23" x="0"/>
 	<e:Label id="lvTxt" text="关卡1" y="451.72" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339" stroke="3" horizontalCenter="0.5"/>
 	<e:Image id="picb" x="286" y="542.5" source="点亮 副本 2gray_png" scaleX="-1"/>

--- a/egret/resource/skins/ScratchPrizeSkin.exml
+++ b/egret/resource/skins/ScratchPrizeSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
        xmlns:w="http://ns.egret.com/wing" xmlns:ns1="*">
+	<e:Image id="combglight" source="combglight_png" y="400.4" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="400.4" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image y="-123.17" horizontalCenter="0"  source="scratchPrize_bg_png"/>
 	<e:Image id="prizeImg" y="426.77" source="" horizontalCenter="0" width="510" height="228"/>
 	<e:Button id="closeBtn" label="" x="610" y="309.33">

--- a/egret/resource/skins/ScratchSkin.exml
+++ b/egret/resource/skins/ScratchSkin.exml
@@ -2,6 +2,8 @@
 <e:Skin class="InviteSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui"
        xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16dd8f58b77" visible="false"/>
+	<e:Image id="combglight" source="combglight_png" y="545.88" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="545.88" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image source="scratch_bg_png" y="21.83" x="-1"/>
 	<e:Image id="light2" x="375" y="496" anchorOffsetX="356" anchorOffsetY="296" source="scratchbg2_png" visible="false"/>
 	<e:Image id="light1" x="375" y="496" anchorOffsetX="356" anchorOffsetY="296" source="scratchbg2_png" visible="false"/>

--- a/egret/resource/skins/ShareCodePanelSkin.exml
+++ b/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"/>

--- a/egret/resource/skins/ShopSkin.exml
+++ b/egret/resource/skins/ShopSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="ShopSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16c953f5068" horizontalCenter="0"/>
+	<e:Image id="combglight" source="combglight_png" y="405.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="405.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image y="-63.48" horizontalCenter="0" source="shop_bg2_png"/>
 	<e:Button id="closeBtn" label="" x="607" y="300.68">
 		<e:skinName>

--- a/egret/resource/skins/SignSkin.exml
+++ b/egret/resource/skins/SignSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="SignSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Image id="combglight" source="combglight_png" y="339.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="339.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image source="signbg_png" y="66.75" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" x="632" y="257.77">
 		<e:skinName>
@@ -25,7 +27,7 @@
 		</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Group id="prizegroup" width="750" height="1206" x="0" y="0">
+	<e:Group id="prizegroup" width="750" height="1206" x="0" y="0" visible="false">
 		<e:Rect id="mask1" fillAlpha="0.8" x="0" y="0" scaleX="1" scaleY="1" width="750" height="1206"/>
 		<e:Group id="lightbot" width="750" height="1206" x="0" y="0"/>
 		<e:Group id="giftbox" width="750" height="1206"/>

--- a/egret/resource/skins/StartPanelSkin.exml
+++ b/egret/resource/skins/StartPanelSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="StartPanelSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16cd285c715"/>
+	<e:Image id="combglight" source="combglight_png" y="302.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="302.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image y="-161.94" source="startpanel通关条件_png" x="0"/>
 	<e:Label id="levelTxt" text="关卡1" y="229" fontFamily="FZY3JW" size="42" textColor="0xffffff" strokeColor="0xff8339"
 	         stroke="3"  anchorOffsetX="0" width="236" textAlign="center" verticalAlign="middle" anchorOffsetY="0" horizontalCenter="0" height="52"/>

--- a/egret/resource/skins/TaskCenterPrizeSkin.exml
+++ b/egret/resource/skins/TaskCenterPrizeSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="SignPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16d5c2563cb"/>
+	<e:Image id="combglight" source="combglight_png" y="362.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="362.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Component y="830" skinName="ADSmallSkin" anchorOffsetX="0" anchorOffsetY="0" horizontalCenter="0" visible="false"/>
 	<e:Image source="TaskCenterPrize_bg_png" y="-150.5" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" x="607" y="240">

--- a/egret/resource/skins/TurntablePrize2Skin.exml
+++ b/egret/resource/skins/TurntablePrize2Skin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="TurntablePrize2" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16e02c1ad57"/>
+	<e:Image id="combglight" source="combglight_png" y="362.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="362.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Image id="light2" source="invitebg2_png" x="376" y="297" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
 	<e:Image id="light1" source="invitebg2_png" x="386" y="307" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
 	<e:Group id="container" y="-98.45" x="-3"/>

--- a/egret/resource/skins/TurntablePrizeSkin.exml
+++ b/egret/resource/skins/TurntablePrizeSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="TurntablePrize" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16e02c1ad57"/>
+	<e:Image id="combglight" source="combglight_png" y="369.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
+	<e:Image id="combglight1" source="combglight_png" y="369.32" anchorOffsetX="375" anchorOffsetY="418" horizontalCenter="0"/>
 	<e:Component y="788" skinName="ADSmallSkin" horizontalCenter="0" visible="false"/>
 	<e:Image id="light2" source="invitebg2_png" x="376" y="297" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>
 	<e:Image id="light1" source="invitebg2_png" x="386" y="307" anchorOffsetX="356" anchorOffsetY="296" visible="false"/>

--- a/egret/src/mainScene/MainScene.ts
+++ b/egret/src/mainScene/MainScene.ts
@@ -3074,14 +3074,15 @@ 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)) {
+            }  else if(ele.hasState(StateType.HONEY)) {
                ele.setState(StateType.HONEY, false);
                createHoneyDisAni(ele.x, ele.y, this)
                this.goElementTarget(ElementType.HONEY, [ele.x, ele.y]);

--- a/egret/src/panels/BloodPanel.ts
+++ b/egret/src/panels/BloodPanel.ts
@@ -143,8 +143,6 @@ export default class BloodPanel extends Panel {

    initEvents() {
        super.initEvents();
-        egret.Tween.get(this['combglight'], { loop: true }).to({ rotation: 360 }, 12000);
-        egret.Tween.get(this['combglight1'], { loop: true }).to({ rotation: -360 }, 12000);

        this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this);
        this['inviteBtn2'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this);

--- a/egret/src/panels/FriendPanel.ts
+++ b/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();
@@ -67,7 +68,7 @@ export default class FriendPanel extends Panel {
                this['avatar0'].source = "http://yun.duiba.com.cn/db_games/default_avatar.png";
            if (data && data.nickname)
                this['nameTxt'].text = getNick(data.nickname, 10);
-            
+
        });
    }

@@ -91,7 +92,7 @@ export default class FriendPanel extends Panel {
            getFriendShareUrl(this.stage);
        } else
            showShare3();
-            // showShareCodePanel(CodeChannels.RankPlay);//mmp，排行榜的分享又不要口令了
+        // showShareCodePanel(CodeChannels.RankPlay);//mmp，排行榜的分享又不要口令了
    }

    protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }

--- a/egret/src/panels/TurntablePanel/Turntable.ts
+++ b/egret/src/panels/TurntablePanel/Turntable.ts
@@ -68,9 +68,6 @@ export default class Turntable extends Panel {

    initEvents() {
        super.initEvents();
-
-        egret.Tween.get(this['combglight'], { loop: true }).to({ rotation: 360 }, 6000);
-        egret.Tween.get(this['combglight1'], { loop: true }).to({ rotation: -360 }, 6000);
        if(this.data.onceAgain) {     // 再抽一次
            return;
        }

--- a/egret/src/something/chapters/Chapter23.ts
+++ b/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 } ] } }
  
  ]
--- a/egret/src/something/enum/ElementConfigType.ts
+++ b/egret/src/something/enum/ElementConfigType.ts
@@ -74,4 +74,5 @@ export enum ElementConfigType {
    CANNO_DIR_RIGHT = 21,
    /** 大炮石头 */
    CANNO_BLOCK = 22,
+    xingxing = 23,
 }
\ No newline at end of file