Skip to content

B
babycare_xiaoxiao
Commit 92754240 authored by 邱旭's avatar 邱旭
Browse files
Options

换了点皮

parent e759e5d8
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 83 deletions
.idea/workspace.xml
View file @ 92754240
...@@ -2,73 +2,8 @@ ...@@ -2,73 +2,8 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="换了点皮"> <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="换了点皮">
<change afterPath="$PROJECT_DIR$/libs/fyge.min.js.map1" afterDir="false" />
<change afterPath="$PROJECT_DIR$/libs/fyge.min.js1" afterDir="false" />
<change afterPath="$PROJECT_DIR$/lotties/BonusTime.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/BonusTime/18986110-634a-4248-a956-b2861424ff16.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/BonusTime/24131c00-9062-43a1-b52d-00d788f75b79.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/BonusTime/2d6cba7b-b5f7-42ef-81e9-bb15a5e6266b.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/BonusTime/2e5f1f43-9af3-4b9b-a8fc-db17964eecb6.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/BonusTime/52e8af6a-f83c-4c95-9f44-d5bb1c20493b.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/BonusTime/5d6129c5-6206-47d5-bb42-b9274ad37e9d.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/BonusTime/6e5ccdc9-ce62-4e1b-88ca-0e269f492ec1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/BonusTime/778a9647-034e-4fad-8a79-d9226ae2ed5d.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/BonusTime/796267bf-092e-44c9-999b-574d305c8769.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/BonusTime/7d410e98-3af4-4bb8-98ac-acf1a8bd48fa.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/BonusTime/93ea4980-6258-4413-bbd7-3260e1117bb6.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/BonusTime/b9f72eac-22ea-4505-b043-24c8a83acd05.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight0.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight10.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight11.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight12.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight13.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight14.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight15.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight16.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight17.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight18.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight19.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight2.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight20.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight21.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight22.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight23.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight24.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight25.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight26.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight27.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight28.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight29.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight3.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight4.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight5.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight6.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight7.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight8.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/loadingScene/loadingLight9.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/scripts/handleLotS1.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/lotties/BonusTime.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/libs/fyge.min.js" beforeDir="false" afterPath="$PROJECT_DIR$/libs/fyge.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/libs/fyge.min.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/libs/fyge.min.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/bonusTime.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/lotties/checkTip.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonus_lottie/0d5e3eff-7726-4e3a-a2d4-409a9e68c2ec.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonus_lottie/16eb7a4a-34a0-45f3-8c02-154b638b1049.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonus_lottie/2c17dca6-ec35-4184-ae72-25813cf8f5dc.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonus_lottie/79040d0c-04ba-4c98-a512-5707d7ed37f5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonus_lottie/93bcd69f-9897-4b12-8bf0-c0659817ccd2.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonus_lottie/e8c749fe-2a3b-4941-8527-37ba70a66e34.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/bonus_lottie/fdcf57c3-b91e-44d2-a011-7a0bbf4e5bb4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/lineLight.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/lineLight.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/handleLotS.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/handleLotS.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/lotties/bonus_lottie.ts" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/scene/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/scene/map/MapUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapUI.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -259,14 +194,7 @@ ...@@ -259,14 +194,7 @@
<workItem from="1617348724978" duration="4857000" /> <workItem from="1617348724978" duration="4857000" />
<workItem from="1617673451602" duration="17243000" /> <workItem from="1617673451602" duration="17243000" />
<workItem from="1617702978246" duration="12255000" /> <workItem from="1617702978246" duration="12255000" />
<workItem from="1617847690167" duration="4850000" /> <workItem from="1617847690167" duration="5213000" />
</task>
<task id="LOCAL-00021" summary="m">
<created>1613715814506</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1613715814506</updated>
</task> </task>
<task id="LOCAL-00022" summary="m"> <task id="LOCAL-00022" summary="m">
<created>1613716046739</created> <created>1613716046739</created>
...@@ -604,7 +532,14 @@ ...@@ -604,7 +532,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1617848844372</updated> <updated>1617848844372</updated>
</task> </task>
<option name="localTasksCounter" value="70" /> <task id="LOCAL-00070" summary="换了点皮">
<created>1617853076796</created>
<option name="number" value="00070" />
<option name="presentableId" value="LOCAL-00070" />
<option name="project" value="LOCAL" />
<updated>1617853076796</updated>
</task>
<option name="localTasksCounter" value="71" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
src/scene/PlayScene.ts
View file @ 92754240
...@@ -53,7 +53,6 @@ import { PropType } from '../something/enum/PropType'; ...@@ -53,7 +53,6 @@ import { PropType } from '../something/enum/PropType';
import { RES } from '../../module/RES'; import { RES } from '../../module/RES';
import { changeScene, hideWaiting, showPanel, showToast, showWaiting, wait } from '../../module/ctrls'; import { changeScene, hideWaiting, showPanel, showToast, showWaiting, wait } from '../../module/ctrls';
import { layers } from '../../module/views/layers'; import { layers } from '../../module/views/layers';
import { Lottie } from '../Lottie';
import { GameToast } from '../something/uis/GameToast'; import { GameToast } from '../something/uis/GameToast';
import { sendTbNet, TbNetName } from '../TaoBaoNet'; import { sendTbNet, TbNetName } from '../TaoBaoNet';
...@@ -352,7 +351,7 @@ export class PlayScene extends Scene { ...@@ -352,7 +351,7 @@ export class PlayScene extends Scene {
*/ */
async initSvgas() { async initSvgas() {
//这里加载资源吧 //这里加载资源吧
var bonusTime = new Lottie(BonusTime); var bonusTime = new FYGE.Lottie(BonusTime);
bonusTime.position.set( bonusTime.position.set(
(750 - bonusTime.videoWidth) / 2, (750 - bonusTime.videoWidth) / 2,
(1624 - bonusTime.videoHeight) / 2 - layers.stageOffsetY - 200 (1624 - bonusTime.videoHeight) / 2 - layers.stageOffsetY - 200
......
src/scene/map/MapUI.ts
View file @ 92754240
...@@ -10,8 +10,6 @@ import { RulePanel } from "../../panels/RulePanel"; ...@@ -10,8 +10,6 @@ import { RulePanel } from "../../panels/RulePanel";
import { sendTbNet, TbNetName } from "../../TaoBaoNet"; import { sendTbNet, TbNetName } from "../../TaoBaoNet";
import { layers } from "../../../module/views/layers"; import { layers } from "../../../module/views/layers";
import { LotteryPanel } from "../../panels/LotteryPanel"; import { LotteryPanel } from "../../panels/LotteryPanel";
import { Lottie } from "../../Lottie";
import { BonusTime } from "../../lotties/BonusTime";
export default class MapUI extends Container { export default class MapUI extends Container {
public energyBox: EnergyBox = null; public energyBox: EnergyBox = null;
...@@ -101,11 +99,6 @@ export default class MapUI extends Container { ...@@ -101,11 +99,6 @@ export default class MapUI extends Container {
this.clearanceBtn = this.addChild(new Button(RES.getRes('clearanceBtn.png'))); this.clearanceBtn = this.addChild(new Button(RES.getRes('clearanceBtn.png')));
this.clearanceBtn.position.set(0, _y + 174); this.clearanceBtn.position.set(0, _y + 174);
this.clearanceBtn.visible = false; this.clearanceBtn.visible = false;
var bonusTime = new Lottie(BonusTime);
this.addChild(bonusTime);
bonusTime.play();
} }
public updateUI() { public updateUI() {
......
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