Skip to content

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

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

parents 56cddaf9 efbba2f5
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 195 deletions
egret/index.html
View file @ cd0f7cb9
......@@ -18,8 +18,8 @@
background-repeat: no-repeat;
background-color: #000;
background-size: 100%;
background-position: top;
background-image: url("https://yun.duiba.com.cn/db_games/activity/game/1577351394/resource/assets/startScene/startscenebg.jpg");
background-position:center;
background-image: url("//localhost:8080/egret/resource/assets/startScene/startscenebg.jpg");
padding: 0;
border: 0;
margin: 0;
......
egret/resource/assets/loading.jpg
View replaced file @ 56cddaf9 View file @ cd0f7cb9
egret/resource/assets/loading.jpg

89.2 KB | W: | H:

egret/resource/assets/loading.jpg

162 KB | W: | H:

egret/resource/assets/loading.jpg
egret/resource/assets/loading.jpg
egret/resource/assets/loading.jpg
egret/resource/assets/loading.jpg
  • 2-up
  • Swipe
  • Onion skin
egret/resource/skins/StartSkin.exml
View file @ cd0f7cb9
......@@ -3,21 +3,22 @@
<w:Config id="16705cb4eec"/>
<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:Component id="bg" width="750" height="1624"/>
<e:Component id="container2" width="20" height="20" x="0" y="0"/>
<e:Component id="container1" width="20" height="20" x="0" y="160"/>
<e:Group x="140" y="944.67">
<e:Image source="loadingbg_png" y="0" x="0"/>
<e:Group id="maskwrapper" x="14.56" y="7.14" locked="true">
<e:Component id="bg" width="750" height="1624" verticalCenter="0"/>
<e:Component id="container2" x="0" width="750" height="1624" verticalCenter="0"/>
<e:Component id="container1" x="0" width="750" height="1624" verticalCenter="240"/>
<e:Group verticalCenter="475" width="750" x="0">
<e:Group y="30.94" x="140">
<e:Image source="loadingbg_png" y="0" x="0"/>
<e:Group id="maskwrapper" x="14.56" y="7.14" locked="true">
<e:Group id="container4" x="0" y="0">
<e:Group id="container3" x="0" y="0"/>
<e:Image source="mask3_png" x="0" y="4"/>
</e:Group>
<e:Image id="progressmask" source="mask_png" x="-0.48" y="4.08" scaleX="1" scaleY="1" width="444" height="55"/>
</e:Group>
<e:Image id="progressmask2" y="9.14" x="16" source="mask2_png" width="444" height="60" scaleX="1"/>
</e:Group>
<e:Image id="progressmask2" y="9.14" x="16" source="mask2_png" width="444" height="60" scaleX="1"/>
<e:Label id="tips" text="正在加载中，请稍后" y="0" size="24" textColor="0xfcd364" horizontalCenter="0"/>
<e:Label id="percentTxt" text="63%" y="117" textColor="0xfcd364" horizontalCenter="0"/>
</e:Group>
<e:Image source="头顶树丛_png" x="0" y="0" visible="false"/>
<e:Label id="tips" text="正在加载中，请稍后" y="913.73" horizontalCenter="0" size="24" textColor="0x000000"/>
<e:Label id="percentTxt" text="63%" y="1030.73" horizontalCenter="0.5" textColor="0x000000"/>
</e:Skin>
\ No newline at end of file
egret/src/mainScene/jellyMonsterAI.ts
View file @ cd0f7cb9
......@@ -5,6 +5,7 @@ import { AiControl } from "../something/logic/AiControl";
import { Tool } from "../something/Tool";
import MainScene from "./MainScene";
import jellyMonsterAni from "./jellyMonsterAni";
import { StateType } from "../something/enum/StateType";
export default async (thisObj: MainScene) => {
//找到所有的怪物
......@@ -14,7 +15,8 @@ export default async (thisObj: MainScene) => {
for (var i = 0; i < thisObj.lattices.length; i++) {
var lattice = thisObj.lattices[i]
if (lattice && lattice.element && lattice.element.type == ElementType.JELLY_MONSTER) {
indexs.push(i);
if (!lattice.element.hasState(StateType.BLOCK_LOCK))
indexs.push(i);
}
}
......@@ -39,7 +41,7 @@ export default async (thisObj: MainScene) => {
const fromEle: Element = thisObj.lattices[fromIndex].element;//起始元素
const endEle: Element = thisObj.lattices[toIndex].element; //终点元素
await fromEle.toAction();//准备开始吹
await jellyMonsterAni(thisObj,[fromEle.x,fromEle.y],[endEle.x,endEle.y]);
await jellyMonsterAni(thisObj, [fromEle.x, fromEle.y], [endEle.x, endEle.y]);
endEle.reset(ElementType.JELLY);
endEle.isMonsterJelly = true;
}
......
egret/src/something/enum/ElementType.ts
View file @ cd0f7cb9
......@@ -191,11 +191,11 @@ export const submitTran = {
6: 3,
9: 2,
10: 10,
22: 10,
23: 10,
24: 10,
25: 10,
26: 10
22: 11,
23: 12,
24: 13,
25: 14,
26: 15
}
// SCORE(1, "分数"),
......
egret/src/startScene/StartScene.ts
View file @ cd0f7cb9
......@@ -24,6 +24,7 @@ export default class StartScene extends Scene {
async start(data?) {
super.start();
this.height=this.stage.stageHeight;
if (data)
this.level = data.level;
this['container1'].x = 20;
......@@ -34,7 +35,6 @@ export default class StartScene extends Scene {
this['percentTxt'].text = `0%`;
const index = Math.floor(Math.random() * list.length);
this['tips'].text = list[index];
// setGlow(this['tips'], 0xffffff, 1);
console.log(data);
if (data && Array.isArray(data)) {
this['container3'].addChild(data[0]);
......
mock/happyclear/home.json
View file @ cd0f7cb9
......@@ -1712,181 +1712,6 @@
"levelNum": 340,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 341,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 342,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 343,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 344,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 345,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 346,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 347,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 348,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 349,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 350,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 351,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 352,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 353,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 354,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 355,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 356,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 357,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 358,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 359,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 360,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 361,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 362,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 363,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 364,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 365,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 366,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 367,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 368,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 369,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 370,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 371,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 372,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 373,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 374,
"maxScore": 47440,
"stars": 1
},
{
"levelNum": 375,
"maxScore": 47440,
"stars": 1
}
],
"remainProp": [
......
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