Commit 8a60835d authored by 邱旭's avatar 邱旭

m

parent 86ab2670
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
<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 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$/resource/loadingScene/loadingBg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/loadingScene/loadingBg.jpg" afterDir="false" /> <change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="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/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/LoadingScene.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
<recent name="$PROJECT_DIR$/lotties" /> <recent name="$PROJECT_DIR$/lotties" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.dev"> <component name="RunManager" selected="npm.buildTS">
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true"> <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" /> <package-json value="$PROJECT_DIR$/package.json" />
<command value="run" /> <command value="run" />
...@@ -116,8 +117,8 @@ ...@@ -116,8 +117,8 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.dev" />
<item itemvalue="npm.buildTS" /> <item itemvalue="npm.buildTS" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
<item itemvalue="npm.copyJs" /> <item itemvalue="npm.copyJs" />
...@@ -135,7 +136,7 @@ ...@@ -135,7 +136,7 @@
<workItem from="1612576979459" duration="13000" /> <workItem from="1612576979459" duration="13000" />
<workItem from="1612577003915" duration="21094000" /> <workItem from="1612577003915" duration="21094000" />
<workItem from="1612662929222" duration="40609000" /> <workItem from="1612662929222" duration="40609000" />
<workItem from="1613698993022" duration="11457000" /> <workItem from="1613698993022" duration="11686000" />
</task> </task>
<task id="LOCAL-00001" summary="斐乐消消乐"> <task id="LOCAL-00001" summary="斐乐消消乐">
<created>1612581213298</created> <created>1612581213298</created>
...@@ -277,7 +278,14 @@ ...@@ -277,7 +278,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1613707149083</updated> <updated>1613707149083</updated>
</task> </task>
<option name="localTasksCounter" value="21" /> <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>
<option name="localTasksCounter" value="22" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
...@@ -12308,11 +12308,15 @@ var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts"); ...@@ -12308,11 +12308,15 @@ var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts"); var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
var layers_1 = __webpack_require__(/*! ../../module/views/layers */ "./module/views/layers.ts"); var layers_1 = __webpack_require__(/*! ../../module/views/layers */ "./module/views/layers.ts");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts"); var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var MapScene_1 = __webpack_require__(/*! ./map/MapScene */ "./src/scene/map/MapScene.ts"); var TEXT_ALIGN = FYGE.TEXT_ALIGN;
var Tween = FYGE.Tween;
var LoadingScene = (function (_super) { var LoadingScene = (function (_super) {
__extends(LoadingScene, _super); __extends(LoadingScene, _super);
function LoadingScene() { function LoadingScene() {
return _super !== null && _super.apply(this, arguments) || this; var _this = _super !== null && _super.apply(this, arguments) || this;
_this.dotTween = null;
_this.dotCount = 0;
return _this;
} }
Object.defineProperty(LoadingScene.prototype, "groupNames", { Object.defineProperty(LoadingScene.prototype, "groupNames", {
get: function () { get: function () {
...@@ -12322,11 +12326,24 @@ var LoadingScene = (function (_super) { ...@@ -12322,11 +12326,24 @@ var LoadingScene = (function (_super) {
configurable: true configurable: true
}); });
LoadingScene.prototype.initUi = function () { LoadingScene.prototype.initUi = function () {
var _this = this;
this.y = -layers_1.layers.stageOffsetY; this.y = -layers_1.layers.stageOffsetY;
this.addChild(FYGE.Sprite.fromFrame("loadingBg.jpg")); this.addChild(FYGE.Sprite.fromFrame("loadingBg.jpg"));
var pro = this.addChild(Tools_1.Tools.getSprite('loadingPro.png')); var pro = this.addChild(Tools_1.Tools.getSprite('loadingPro.png'));
pro.position.set(80, 768); pro.position.set(80, 768);
this.progressBar = new ProgressBarS_1.ProgressBarS(pro); this.progressBar = new ProgressBarS_1.ProgressBarS(pro);
this.loadingTxt = this.addChild(Tools_1.Tools.getText("loading...", 28, "#feeeea", TEXT_ALIGN.CENTER, 750, 0, 841));
this.dotTween = Tween.get(FYGE, { loop: true })
.to({}, 500)
.call(function () {
_this.dotCount = ++_this.dotCount % 3 || 3;
_this.loadingTxt.text = "loading" + _this.strMul('.', _this.dotCount);
});
};
LoadingScene.prototype.strMul = function (str, by) {
by = (by >> 0);
var t = (by > 1 ? this.strMul(str, by / 2) : '');
return t + (by % 2 ? t + str : t);
}; };
LoadingScene.prototype.start = function () { LoadingScene.prototype.start = function () {
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
...@@ -12369,12 +12386,12 @@ var LoadingScene = (function (_super) { ...@@ -12369,12 +12386,12 @@ var LoadingScene = (function (_super) {
.call(function () { .call(function () {
if (pro >= 1) { if (pro >= 1) {
_this.removeEventListener(FYGE.Event.PROGRESS, _this.progressEvent, _this); _this.removeEventListener(FYGE.Event.PROGRESS, _this.progressEvent, _this);
ctrls_1.changeScene(MapScene_1.MapScene, { from: "loading" });
} }
}); });
}; };
LoadingScene.prototype.destroy = function () { LoadingScene.prototype.destroy = function () {
_super.prototype.destroy.call(this); _super.prototype.destroy.call(this);
Tween.removeTweenSelf(this.dotTween);
}; };
return LoadingScene; return LoadingScene;
}(Scene_1.Scene)); }(Scene_1.Scene));
This diff is collapsed.
...@@ -4,10 +4,11 @@ import { ProgressBarS } from "../common/ProgressBarS"; ...@@ -4,10 +4,11 @@ import { ProgressBarS } from "../common/ProgressBarS";
import { RES } from "../../module/RES"; import { RES } from "../../module/RES";
import { sendTbNet, TbNetName } from "../TaoBaoNet"; import { sendTbNet, TbNetName } from "../TaoBaoNet";
import { layers } from "../../module/views/layers"; import { layers } from "../../module/views/layers";
import { showToast } from "../../module/ctrls"; import { changeScene, showToast } from "../../module/ctrls";
import TEXT_ALIGN = FYGE.TEXT_ALIGN; import TEXT_ALIGN = FYGE.TEXT_ALIGN;
import TextField = FYGE.TextField; import TextField = FYGE.TextField;
import Tween = FYGE.Tween; import Tween = FYGE.Tween;
import { MapScene } from "./map/MapScene";
export class LoadingScene extends Scene { export class LoadingScene extends Scene {
get groupNames() { get groupNames() {
...@@ -97,7 +98,7 @@ export class LoadingScene extends Scene { ...@@ -97,7 +98,7 @@ export class LoadingScene extends Scene {
.call(() => { .call(() => {
if (pro >= 1) { if (pro >= 1) {
this.removeEventListener(FYGE.Event.PROGRESS, this.progressEvent, this); this.removeEventListener(FYGE.Event.PROGRESS, this.progressEvent, this);
// changeScene(MapScene, {from: "loading"}); changeScene(MapScene, {from: "loading"});
// showPanel(LotteryPanel); // showPanel(LotteryPanel);
// changeScene(PlayScene, { chapter: 1 }); // changeScene(PlayScene, { chapter: 1 });
// changeScene(LotteryScene,{level:1}); // changeScene(LotteryScene,{level:1});
......
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