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

763e5968 · zjz1994 · 23e42a3b · 8d2b6dd0 · 763e5968 · 763e5968
Commit 763e5968 authored Apr 02, 2020 by zjz1994
25 changed files
--- a/250-250(1)/startpanel_ele0.png
+++ b/250-250(1)/startpanel_ele0.png
--- a/250-250(1)/startpanel_ele1.png
+++ b/250-250(1)/startpanel_ele1.png
--- a/250-250(1)/startpanel_ele10.png
+++ b/250-250(1)/startpanel_ele10.png
--- a/250-250(1)/startpanel_ele2.png
+++ b/250-250(1)/startpanel_ele2.png
--- a/250-250(1)/startpanel_ele22.png
+++ b/250-250(1)/startpanel_ele22.png
--- a/250-250(1)/startpanel_ele23.png
+++ b/250-250(1)/startpanel_ele23.png
--- a/250-250(1)/startpanel_ele24.png
+++ b/250-250(1)/startpanel_ele24.png
--- a/250-250(1)/startpanel_ele25.png
+++ b/250-250(1)/startpanel_ele25.png
--- a/250-250(1)/startpanel_ele26.png
+++ b/250-250(1)/startpanel_ele26.png
--- a/250-250(1)/startpanel_ele3.png
+++ b/250-250(1)/startpanel_ele3.png
--- a/250-250(1)/startpanel_ele34.png
+++ b/250-250(1)/startpanel_ele34.png
--- a/250-250(1)/startpanel_ele36.png
+++ b/250-250(1)/startpanel_ele36.png
--- a/250-250(1)/startpanel_ele4.png
+++ b/250-250(1)/startpanel_ele4.png
--- a/250-250(1)/startpanel_ele5.png
+++ b/250-250(1)/startpanel_ele5.png
--- a/250-250(1)/startpanel_ele6.png
+++ b/250-250(1)/startpanel_ele6.png
--- a/250-250(1)/startpanel_ele7.png
+++ b/250-250(1)/startpanel_ele7.png
--- a/250-250(1)/startpanel_ele9.png
+++ b/250-250(1)/startpanel_ele9.png
--- a/egret/resource/TextureMerger/blood.tmproject
+++ b/egret/resource/TextureMerger/blood.tmproject
-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood","version":5,"files":["../assets/blood/blood体力补济站.png","../assets/blood/blood按钮.png","../assets/blood/blood按钮 副本1.png","../assets/blood/blood按钮 副本.png","../assets/blood/blood去分享.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood","version":5,"files":["../assets/blood/blood体力补济站.png","../assets/blood/blood按钮.png","../assets/blood/blood按钮 副本1.png","../assets/blood/blood按钮 副本.png","../assets/blood/blood去分享.png","../assets/blood/blooduanm.png","../assets/blood/bloodhert.png","../assets/blood/choujiang.png","../assets/blood/itembg.png"]}
\ No newline at end of file
--- a/egret/resource/TextureMerger/preload.tmproject
+++ b/egret/resource/TextureMerger/preload.tmproject
-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/help/help_light.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/common/combglight.png"]}
\ No newline at end of file
--- a/egret/resource/assets/mainScene/playSceneBg.jpg
+++ b/egret/resource/assets/mainScene/playSceneBg.jpg
--- a/egret/resource/assets/mainScene/progressDown.png
+++ b/egret/resource/assets/mainScene/progressDown.png
--- a/egret/resource/assets/mainScene/stepsBoard.png
+++ b/egret/resource/assets/mainScene/stepsBoard.png
--- a/egret/resource/assets/mainScene/targetBoard.png
+++ b/egret/resource/assets/mainScene/targetBoard.png
--- a/egret/resource/skins/Main2Skin.exml
+++ b/egret/resource/skins/Main2Skin.exml
@@ -7,7 +7,7 @@
 	<e:Image y="247" source="targetBoard_png" x="174"/>
 	<e:Image y="0" source="progressDown_png" horizontalCenter="0"/>
 	<e:Image id="starProgress" x="138" y="206.85" source="starProgress_png"/>
-	<e:Image x="69" y="-1.15" source="stepsBoard_png"/>
+	<e:Image x="69" y="-17" source="stepsBoard_png"/>
 	<e:Image x="171.5" y="213.85" source="dangqianfenshu_png"/>



--- a/egret/src/mapScene/GuideCon.ts
+++ b/egret/src/mapScene/GuideCon.ts
@@ -187,7 +187,7 @@ export class GuideCon extends egret.DisplayObjectContainer {
        "这里是元宝，闯关成功后可\n随机获得大量元宝，元宝可\n用于兑换体力值和游戏道具",
        "在这里选择查看关卡，闯关\n成功后还有机会赢得丰厚奖\n励哟！",
        "每个关卡收集的星星可用于\n开启宝箱，宝箱里还有更多\n无敌券、品牌券在等你！",
-        "进入道具商城去兑换道具为\n游戏加分吧~获得的奖励可\n在“我的奖励”中查看哦"
+        "点击头像可在这里查看好友\n排名和炫耀成绩"
    ];

    /**