Skip to content

X
xiaoxiaole
Commit 654f1f66 authored by 邱旭's avatar 邱旭
Browse files
Options

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

parents e72b4eab 6c8dfb23
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
egret/.wing/exml.json
View file @ 654f1f66
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"globalBackgroundImage": "", "globalBackgroundImage": "",
"globalAutoLayerMarkEnable": false, "globalAutoLayerMarkEnable": false,
"gridColor": 13238148, "gridColor": 13238148,
"gridEnabled": true, "gridEnabled": false,
"gridSize": "50" "gridSize": "50"
}, },
"1667fb18fa6": { "1667fb18fa6": {
......
egret/index.html
View file @ 654f1f66
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
background-color: #000; background-color: #000;
background-size: 100%; background-size: 100%;
background-position:center; background-position:center;
background-image: url("https://yun.duiba.com.cn/db_games/activity/game/02072/startscenebg.jpg"); background-image: url("https://yun.duiba.com.cn/db_games/activity/game/0217/startscenebg.jpg");
/* background-image: url("https://yun.duiba.com.cn/db_games/activity/game/1565600901/resource/assets/startScene/startscenebg.jpg"); */ /* background-image: url("https://yun.duiba.com.cn/db_games/activity/game/1565600901/resource/assets/startScene/startscenebg.jpg"); */
padding: 0; padding: 0;
border: 0; border: 0;
......
egret/resource/assets/svgas/loading_animals.svga 100755 → 100644
View file @ 654f1f66
No preview for this file type
egret/resource/skins/StartSkin.exml
View file @ 654f1f66
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<e:Label id="FZY3JW" text=" " y="1048" textColor="0x244B00" fontFamily="FZY3JW" horizontalCenter="0" visible="false"/> <e:Label id="FZY3JW" text=" " y="1048" textColor="0x244B00" fontFamily="FZY3JW" horizontalCenter="0" visible="false"/>
<e:Label id="FZY4JW" text=" " y="1048" textColor="0x244B00" fontFamily="FZY4JW" horizontalCenter="0" visible="false"/> <e:Label id="FZY4JW" text=" " y="1048" textColor="0x244B00" fontFamily="FZY4JW" horizontalCenter="0" visible="false"/>
<e:Component id="bg" width="750" height="1624" verticalCenter="0" visible="false"/> <e:Component id="bg" width="750" height="1624" verticalCenter="0" visible="false"/>
<e:Component id="container2" x="0" width="750" height="1624" y="0" visible="false"/> <e:Component id="container2" x="0" width="750" height="1624" verticalCenter="0"/>
<e:Component id="container1" x="0" width="750" height="1624" visible="false"/> <e:Component id="container1" x="0" width="750" height="1624" verticalCenter="235"/>
<e:Group width="750" x="0" verticalCenter="494"> <e:Group width="750" x="0" verticalCenter="494">
<e:Group y="30.94" x="140"> <e:Group y="30.94" x="140">
<e:Image source="loadingbg_png" y="0" x="0"/> <e:Image source="loadingbg_png" y="0" x="0"/>
......
egret/src/something/enum/ElementType.ts
View file @ 654f1f66
...@@ -54,6 +54,8 @@ export enum ElementType { ...@@ -54,6 +54,8 @@ export enum ElementType {
MONSTER_PIG, MONSTER_PIG,
FISH,//气鼓鱼 FISH,//气鼓鱼
// 蜂蜜
// BEE,//气鼓鱼
} }
export const isMonsterEle = (t: ElementType) => { export const isMonsterEle = (t: ElementType) => {
......
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