Skip to content

X
xiaoxiaole
Commit 616485b1 authored by zjz1994's avatar zjz1994
Browse files
Options

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

parents 780f929d c770278d
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
egret/resource/assets/common/nums4.fnt
View file @ 616485b1
{"file":"nums4.png","frames":{
"7":{"x":0,"y":36,"w":24,"h":34,"offX":0,"offY":0,"sourceW":24,"sourceH":34},
"8":{"x":54,"y":0,"w":24,"h":34,"offX":0,"offY":0,"sourceW":24,"sourceH":34},
"9":{"x":51,"y":36,"w":23,"h":34,"offX":0,"offY":0,"sourceW":23,"sourceH":34},
"5":{"x":26,"y":36,"w":23,"h":34,"offX":0,"offY":0,"sourceW":23,"sourceH":34},
"6":{"x":80,"y":0,"w":24,"h":34,"offX":0,"offY":0,"sourceW":24,"sourceH":34},
"7":{"x":98,"y":0,"w":24,"h":34,"offX":0,"offY":0,"sourceW":24,"sourceH":34},
"8":{"x":74,"y":0,"w":24,"h":34,"offX":0,"offY":0,"sourceW":24,"sourceH":34},
"9":{"x":0,"y":34,"w":23,"h":34,"offX":0,"offY":0,"sourceW":23,"sourceH":34},
"5":{"x":23,"y":34,"w":23,"h":34,"offX":0,"offY":0,"sourceW":23,"sourceH":34},
"6":{"x":50,"y":0,"w":24,"h":34,"offX":0,"offY":0,"sourceW":24,"sourceH":34},
"4":{"x":0,"y":0,"w":25,"h":34,"offX":0,"offY":0,"sourceW":25,"sourceH":34},
"2":{"x":101,"y":36,"w":22,"h":34,"offX":0,"offY":0,"sourceW":22,"sourceH":34},
"0":{"x":27,"y":0,"w":25,"h":34,"offX":0,"offY":0,"sourceW":25,"sourceH":34},
"1":{"x":106,"y":0,"w":15,"h":34,"offX":0,"offY":0,"sourceW":15,"sourceH":34},
"3":{"x":76,"y":36,"w":23,"h":34,"offX":0,"offY":0,"sourceW":23,"sourceH":34}}}
\ No newline at end of file
"3":{"x":46,"y":34,"w":23,"h":34,"offX":0,"offY":0,"sourceW":23,"sourceH":34},
"2":{"x":69,"y":34,"w":22,"h":34,"offX":0,"offY":0,"sourceW":22,"sourceH":34},
"1":{"x":91,"y":34,"w":15,"h":34,"offX":0,"offY":0,"sourceW":15,"sourceH":34},
"0":{"x":25,"y":0,"w":25,"h":34,"offX":0,"offY":0,"sourceW":25,"sourceH":34}}}
\ No newline at end of file
egret/resource/assets/common/nums4.png
View replaced file @ 780f929d View file @ 616485b1
egret/resource/assets/common/nums4.png

5.44 KB | W: | H:

egret/resource/assets/common/nums4.png

5.37 KB | W: | H:

egret/resource/assets/common/nums4.png
egret/resource/assets/common/nums4.png
egret/resource/assets/common/nums4.png
egret/resource/assets/common/nums4.png
  • 2-up
  • Swipe
  • Onion skin
egret/resource/skins/StartPanelSkin.exml
View file @ 616485b1
......@@ -31,10 +31,10 @@
<e:Image source="startpanel目标3_png" horizontalCenter="0" verticalCenter="-53"/>
<e:BitmapLabel id="targetScoreTxt" text="0" font="nums2_fnt" horizontalCenter="0" verticalCenter="23"/>
</e:Group>
<e:Group id="targetGroup" y="344.06" width="405" horizontalCenter="0.5" height="169">
<e:Group id="targetGroup" y="344.06" width="503" height="169" anchorOffsetX="0" horizontalCenter="2.5">
<e:List id="list" anchorOffsetX="0" anchorOffsetY="0" horizontalCenter="0" scaleX="1.3" scaleY="1.3" verticalCenter="0">
<e:layout>
<e:HorizontalLayout gap="19"/>
<e:HorizontalLayout gap="21"/>
</e:layout>
</e:List>
<e:Label id="tips" text="在指定步数内消灭目标元素" y="23" size="24" fontFamily="FZY3JW" textAlign="center" textColor="0x885037" bold="true" horizontalCenter="0" visible="false"/>
......
egret/resource/skins/TargetItemSkin.exml
View file @ 616485b1
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="TargetItemSkin" width="110" height="80" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Skin class="TargetItemSkin" width="100" height="70" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<w:Config id="16cfafb2357"/>
<e:Image id="icon0" width="80" height="80" source="startpanel_ele0_png"/>
<e:Image id="icon1" width="80" height="80" source="startpanel_ele1_png"/>
<e:Image id="icon2" width="80" height="80" source="startpanel_ele2_png"/>
<e:Image id="icon3" width="80" height="80" source="startpanel_ele3_png"/>
<e:Image id="icon4" width="80" height="80" source="startpanel_ele4_png"/>
<e:Image id="icon5" width="80" height="80" source="startpanel_ele5_png"/>
<e:Image id="icon6" width="80" height="80" source="startpanel_ele6_png"/>
<e:Image id="icon7" width="80" height="80" source="startpanel_ele7_png"/>
<e:Image id="icon8" width="80" height="80" source="startpanel_ele8_png"/>
<e:Image id="icon9" width="80" height="80" source="startpanel_ele9_png"/>
<e:Image id="icon10" width="80" height="80" source="startpanel_ele10_png"/>
<e:Image id="icon22" width="80" height="80" source="startpanel_ele22_png"/>
<e:Image id="icon23" width="80" height="80" source="startpanel_ele23_png"/>
<e:Image id="icon24" width="80" height="80" source="startpanel_ele24_png"/>
<e:Image id="icon25" width="80" height="80" source="startpanel_ele25_png"/>
<e:Image id="icon26" width="80" height="80" source="startpanel_ele26_png"/>
<e:Image id="icon34" width="80" height="80" source="startpanel_ele34_png"/>
<e:Image id="icon36" width="80" height="80" source="startpanel_ele36_png"/>
<e:BitmapLabel id="txt" text="0" font="nums4_fnt" verticalCenter="23" x="85"/>
<e:Image id="icon0" width="70" height="70" source="startpanel_ele0_png"/>
<e:Image id="icon1" width="70" height="70" source="startpanel_ele1_png"/>
<e:Image id="icon2" width="70" height="70" source="startpanel_ele2_png"/>
<e:Image id="icon3" width="70" height="70" source="startpanel_ele3_png"/>
<e:Image id="icon4" width="70" height="70" source="startpanel_ele4_png"/>
<e:Image id="icon5" width="70" height="70" source="startpanel_ele5_png"/>
<e:Image id="icon6" width="70" height="70" source="startpanel_ele6_png"/>
<e:Image id="icon7" width="70" height="70" source="startpanel_ele7_png"/>
<e:Image id="icon8" width="70" height="70" source="startpanel_ele8_png"/>
<e:Image id="icon9" width="70" height="70" source="startpanel_ele9_png"/>
<e:Image id="icon10" width="70" height="70" source="startpanel_ele10_png"/>
<e:Image id="icon22" width="70" height="70" source="startpanel_ele22_png"/>
<e:Image id="icon23" width="70" height="70" source="startpanel_ele23_png"/>
<e:Image id="icon24" width="70" height="70" source="startpanel_ele24_png"/>
<e:Image id="icon25" width="70" height="70" source="startpanel_ele25_png"/>
<e:Image id="icon26" width="70" height="70" source="startpanel_ele26_png"/>
<e:Image id="icon34" width="70" height="70" source="startpanel_ele34_png"/>
<e:Image id="icon36" width="70" height="70" source="startpanel_ele36_png"/>
<e:BitmapLabel id="txt" text="0" font="nums4_fnt" verticalCenter="20.5" x="73.2" scaleX="0.85" scaleY="0.85"/>
</e:Skin>
\ No newline at end of file
egret/src/mapScene/GuideCon.ts
View file @ 616485b1
......@@ -187,7 +187,7 @@ export class GuideCon extends egret.DisplayObjectContainer {
"这里是元宝，闯关成功后可\n随机获得大量元宝，元宝可\n用于兑换体力值和游戏道具",
"在这里选择查看关卡，闯关\n成功后还有机会赢得丰厚奖\n励哟！",
"每个关卡收集的星星可用于\n开启宝箱，宝箱里还有更多\n无敌券、品牌券在等你！",
"点击头像可在这里查看好友\n排名和炫耀成绩"
"点击头像可在这里查看好友\n排名和炫耀成绩!"
];
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment