Skip to content

D
db-game-template
Commit 531a0edc authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

1

parent 1c5f67b8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 569 additions and 719 deletions
.idea/workspace.xml
View file @ 531a0edc
...@@ -2,9 +2,42 @@ ...@@ -2,9 +2,42 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9464afa6-0efb-46c2-9cfd-05475acd81df" name="Default Changelist" comment=""> <list default="true" id="9464afa6-0efb-46c2-9cfd-05475acd81df" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.history/egret/libs/modules/egret/egret.web_20190719140236.js" beforeDir="false" afterPath="$PROJECT_DIR$/.history/egret/libs/modules/egret/egret.web_20190719140236.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.history/egret/libs/modules/egret/egret.web_20190824131424.js" beforeDir="false" afterPath="$PROJECT_DIR$/.history/egret/libs/modules/egret/egret.web_20190824131424.js" 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$/egret/libs/tc/util/HtmlTextParser.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/tc/util/HtmlTextParser.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/index1.html" beforeDir="false" afterPath="$PROJECT_DIR$/egret/index1.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Panels/RulePanel/RulePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/RulePanel/RulePanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/egret/libs/modules/assetsmanager/assetsmanager.js" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/modules/assetsmanager/assetsmanager.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/libs/modules/egret/egret.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/modules/egret/egret.d.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/libs/modules/egret/egret.js" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/modules/egret/egret.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/libs/modules/egret/egret.web.js" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/modules/egret/egret.web.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/libs/modules/eui/eui.js" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/modules/eui/eui.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/libs/modules/game/game.js" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/modules/game/game.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/libs/modules/tween/tween.js" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/modules/tween/tween.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/libs/physics.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/libs/physics.d.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/default.res.json" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/default.res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/default.thm.json" beforeDir="false" afterPath="$PROJECT_DIR$/egret/resource/default.thm.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/skins/IndexSceneSkin.exml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/egret/resource/skins/IndexUISkin.exml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/AssetAdapter.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/AssetAdapter.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Main.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Panels/SellPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/SellPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Panels/SelledPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/SelledPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Panels/TaskPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/TaskPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Panels/WareHousePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Panels/WareHousePanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/IndexScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/MainScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/IndexUI.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/MainUI.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/LandMgr.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/LandMgr.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/Objs/Crop.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/Objs/Crop.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/Objs/Land.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/Objs/Land.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/Objs/OptionPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/Objs/OptionPanel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/ProgressMgr.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/ProgressMgr.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/TimeProgressBar.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/IndexScene/TimeProgressBar.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/Scenes/loadingScene/LoadingScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/Scenes/loadingScene/LoadingScene.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/ThemeAdapter.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/ThemeAdapter.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/comm/Dispatcher.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/comm/Dispatcher.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/components/ProgressNum.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/components/ProgressNum.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/types/Scenes.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/types/Scenes.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/egret/src/types/sceneTypes.ts" beforeDir="false" afterPath="$PROJECT_DIR$/egret/src/types/sceneTypes.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -18,8 +51,8 @@ ...@@ -18,8 +51,8 @@
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
<list> <list>
<option value="TypeScript File" />
<option value="JsonFile" /> <option value="JsonFile" />
<option value="TypeScript File" />
</list> </list>
</option> </option>
</component> </component>
...@@ -47,14 +80,15 @@ ...@@ -47,14 +80,15 @@
<property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" /> <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/egret/src/Panels" />
</key>
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/egret/src/Panels" /> <recent name="$PROJECT_DIR$/egret/src/Panels" />
<recent name="$PROJECT_DIR$/egret/src/components" /> <recent name="$PROJECT_DIR$/egret/src/components" />
<recent name="$PROJECT_DIR$/egret/src/Panels/toastPanel" /> <recent name="$PROJECT_DIR$/egret/src/Panels/toastPanel" />
</key> </key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/egret/src/Scenes/IndexScene" />
<recent name="$PROJECT_DIR$/egret/src/Panels" />
</key>
</component> </component>
<component name="ServiceViewManager"> <component name="ServiceViewManager">
<option name="viewStates"> <option name="viewStates">
...@@ -102,7 +136,8 @@ ...@@ -102,7 +136,8 @@
<workItem from="1576573310427" duration="18000" /> <workItem from="1576573310427" duration="18000" />
<workItem from="1576573375140" duration="43000" /> <workItem from="1576573375140" duration="43000" />
<workItem from="1576582493871" duration="170000" /> <workItem from="1576582493871" duration="170000" />
<workItem from="1576582917243" duration="1636000" /> <workItem from="1576582917243" duration="1805000" />
<workItem from="1576806980182" duration="4787000" />
</task> </task>
<servers /> <servers />
</component> </component>
...@@ -138,10 +173,10 @@ ...@@ -138,10 +173,10 @@
<screen x="36" y="23" width="1644" height="1027" /> <screen x="36" y="23" width="1644" height="1027" />
</state> </state>
<state x="586" y="160" key="refactoring.ChangeSignatureDialog/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027" timestamp="1575965663028" /> <state x="586" y="160" key="refactoring.ChangeSignatureDialog/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027" timestamp="1575965663028" />
<state x="523" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1576584095877"> <state x="523" y="250" width="670" height="676" key="search.everywhere.popup" timestamp="1576810832153">
<screen x="36" y="23" width="1644" height="1027" /> <screen x="36" y="23" width="1644" height="1027" />
</state> </state>
<state x="523" y="250" width="670" height="676" key="search.everywhere.popup/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027" timestamp="1576584095877" /> <state x="523" y="250" width="670" height="676" key="search.everywhere.popup/36.23.1644.1027/1680.-229.1920.1177@36.23.1644.1027" timestamp="1576810832153" />
<state x="523" y="250" width="670" height="676" key="search.everywhere.popup/36.23.1644.1027@36.23.1644.1027" timestamp="1576573315855" /> <state x="523" y="250" width="670" height="676" key="search.everywhere.popup/36.23.1644.1027@36.23.1644.1027" timestamp="1576573315855" />
</component> </component>
</project> </project>
\ No newline at end of file
egret/index1.html
View file @ 531a0edc
This diff is collapsed.
egret/libs/modules/assetsmanager/assetsmanager.js
View file @ 531a0edc
...@@ -33,7 +33,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key, ...@@ -33,7 +33,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
// THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS // THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES // OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
// IN NO EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // IN NO M_EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA,
// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF // OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
...@@ -326,7 +326,7 @@ var RES; ...@@ -326,7 +326,7 @@ var RES;
// THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS // THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES // OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
// IN NO EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // IN NO M_EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA,
// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF // OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
...@@ -762,7 +762,7 @@ var RES; ...@@ -762,7 +762,7 @@ var RES;
// THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS // THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES // OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
// IN NO EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // IN NO M_EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA,
// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF // OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
...@@ -1821,7 +1821,7 @@ var RES; ...@@ -1821,7 +1821,7 @@ var RES;
// THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS // THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES // OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
// IN NO EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // IN NO M_EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA,
// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF // OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
...@@ -2318,7 +2318,7 @@ var RES; ...@@ -2318,7 +2318,7 @@ var RES;
// THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS // THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES // OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
// IN NO EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // IN NO M_EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA,
// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF // OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
...@@ -2540,7 +2540,7 @@ var RES; ...@@ -2540,7 +2540,7 @@ var RES;
// THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS // THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES // OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
// IN NO EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // IN NO M_EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA,
// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF // OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
......
egret/libs/modules/egret/egret.d.ts
View file @ 531a0edc
...@@ -157,7 +157,7 @@ declare namespace egret { ...@@ -157,7 +157,7 @@ declare namespace egret {
/** /**
* @inheritDoc * @inheritDoc
* @version Egret 2.4 * @version Egret 2.4
* @platform Web,Native * @platform Web,removeEventListener
*/ */
once(type: string, listener: Function, thisObject: any, useCapture?: boolean, priority?: number): void; once(type: string, listener: Function, thisObject: any, useCapture?: boolean, priority?: number): void;
/** /**
......
egret/libs/modules/egret/egret.js
View file @ 531a0edc
This diff is collapsed.
egret/libs/modules/egret/egret.web.js
View file @ 531a0edc
This diff is collapsed.
egret/libs/modules/eui/eui.js
View file @ 531a0edc
This diff is collapsed.
egret/libs/modules/game/game.js
View file @ 531a0edc
This diff is collapsed.
egret/libs/modules/tween/tween.js
View file @ 531a0edc
...@@ -27,7 +27,7 @@ r.prototype = e.prototype, t.prototype = new r(); ...@@ -27,7 +27,7 @@ r.prototype = e.prototype, t.prototype = new r();
// THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS // THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES // OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
// IN NO EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // IN NO M_EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA,
// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF // OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
...@@ -668,7 +668,7 @@ var egret; ...@@ -668,7 +668,7 @@ var egret;
// THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS // THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES // OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
// IN NO EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // IN NO M_EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA,
// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF // OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
...@@ -1477,7 +1477,7 @@ var egret; ...@@ -1477,7 +1477,7 @@ var egret;
// THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS // THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES // OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
// IN NO EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // IN NO M_EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA,
// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF // OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
......
egret/libs/physics.d.ts
View file @ 531a0edc
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
// THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS // THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES // OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
// IN NO EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // IN NO M_EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA,
// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF // OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
......
egret/resource/default.res.json
View file @ 531a0edc
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
}, },
{ {
"keys": "index_bg_png", "keys": "index_bg_png",
"name": "index_scene" "name": "main_scene"
}, },
{ {
"keys": "兑换记录_png,浇水_png,流水装饰_png,默认头像_png,任务_png,商店_png,饲料_png,头像背景_png,勋章_png,头像面板_png,加速卡_png,仓库_btn_png", "keys": "兑换记录_png,浇水_png,流水装饰_png,默认头像_png,任务_png,商店_png,饲料_png,头像背景_png,勋章_png,头像面板_png,加速卡_png,仓库_btn_png",
"name": "index_ui" "name": "main_ui"
}, },
{ {
"keys": "篱笆_png,plant_cattle_1_png,plant_cattle_2_png,plant_chicken_1_png,plant_chicken_2_png,plant_corn_1_png,plant_corn_2_png,plant_land_active_png,plant_land_animal_png,plant_land_none_png,plant_land_plant_png,plant_wheat_1_png,plant_wheat_2_png,食槽_png,_DS_Store,feed_png,feeding_png,hand_png,option_chicken_png,option_panel_png,option_wheat_png,water_png,watering_png,plant_cattle_3_png,plant_cattle_4_png,plant_chicken_3_png,plant_chicken_4_png,plant_corn_3_png,plant_wheat_3_png,麦粉_png,鸡蛋_png", "keys": "篱笆_png,plant_cattle_1_png,plant_cattle_2_png,plant_chicken_1_png,plant_chicken_2_png,plant_corn_1_png,plant_corn_2_png,plant_land_active_png,plant_land_animal_png,plant_land_none_png,plant_land_plant_png,plant_wheat_1_png,plant_wheat_2_png,食槽_png,_DS_Store,feed_png,feeding_png,hand_png,option_chicken_png,option_panel_png,option_wheat_png,water_png,watering_png,plant_cattle_3_png,plant_cattle_4_png,plant_chicken_3_png,plant_chicken_4_png,plant_corn_3_png,plant_wheat_3_png,麦粉_png,鸡蛋_png",
...@@ -470,11 +470,6 @@ ...@@ -470,11 +470,6 @@
"type": "image", "type": "image",
"name": "浇水2_png" "name": "浇水2_png"
}, },
{
"url": "assets/warehouse_panel/sell_panel/hand.png",
"type": "image",
"name": "hand2_png"
},
{ {
"url": "assets/warehouse_panel/sell_panel/sell_hand.png", "url": "assets/warehouse_panel/sell_panel/sell_hand.png",
"type": "image", "type": "image",
......
egret/resource/default.thm.json
View file @ 531a0edc
{ {
"skins": {}, "skins": {},
"autoGenerateExmlsList": true, "autoGenerateExmlsList": true,
"exmls": [ "exmls": [
"resource/skins/IndexSceneSkin.exml", "resource/skins/MainSceneSkin.exml",
"resource/skins/IndexUISkin.exml", "resource/skins/MainUISkin.exml",
"resource/skins/LoadingSceneSkin.exml", "resource/skins/LoadingSceneSkin.exml",
"resource/skins/LoadingSkin.exml", "resource/skins/LoadingSkin.exml",
"resource/skins/RulePanelSkin.exml", "resource/skins/RulePanelSkin.exml",
"resource/skins/SellPanelSkin.exml", "resource/skins/SellPanelSkin.exml",
"resource/skins/SellRecordItemSkin.exml", "resource/skins/SellRecordItemSkin.exml",
"resource/skins/SellRecordSkin.exml", "resource/skins/SellRecordSkin.exml",
"resource/skins/SelledPanelSkin.exml", "resource/skins/SelledPanelSkin.exml",
"resource/skins/TaskItemSkin.exml", "resource/skins/TaskItemSkin.exml",
"resource/skins/TaskPanelSkin.exml", "resource/skins/TaskPanelSkin.exml",
"resource/skins/TaskToastSkin.exml", "resource/skins/TaskToastSkin.exml",
"resource/skins/ToastPanelSkin.exml", "resource/skins/ToastPanelSkin.exml",
"resource/skins/WareHouseSkin.exml", "resource/skins/WareHouseSkin.exml",
"resource/skins/Component/BarSkin.exml", "resource/skins/Component/BarSkin.exml",
"resource/skins/Component/ProgressNumSkin.exml", "resource/skins/Component/ProgressNumSkin.exml",
"resource/skins/Component/TimeProgressBarSkin.exml", "resource/skins/Component/TimeProgressBarSkin.exml",
"resource/skins/Objs/CropSkin.exml", "resource/skins/Objs/CropSkin.exml",
"resource/skins/Objs/LandSkin.exml", "resource/skins/Objs/LandSkin.exml",
"resource/skins/Objs/OptionPanelSkin.exml", "resource/skins/Objs/OptionPanelSkin.exml",
"resource/skins/ui/IconButtonSkin.exml", "resource/skins/ui/IconButtonSkin.exml",
"resource/skins/ui/ProgressBarSkin.exml" "resource/skins/ui/ProgressBarSkin.exml"
], ],
"path": "resource/default.thm.json" "path": "resource/default.thm.json"
} }
\ No newline at end of file
egret/src/AssetAdapter.ts
View file @ 531a0edc
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
// THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS // THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES // OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
// IN NO EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // IN NO M_EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA,
// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF // OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
......
egret/src/Main.ts
View file @ 531a0edc
...@@ -100,14 +100,14 @@ class Main extends eui.UILayer { ...@@ -100,14 +100,14 @@ class Main extends eui.UILayer {
let bar = new Bar(); let bar = new Bar();
this.addChild(bar); this.addChild(bar);
this.getGameRes().then(() => { this.getGameRes().then(() => {
SceneCtrl.instance.change(ModuleTypes.INDEX_SCENE); SceneCtrl.instance.change(ModuleTypes.MAIN_SCENE);
}); });
} }
//加载游戏中的资源 //加载游戏中的资源
private async getGameRes() { private async getGameRes() {
await RES.loadGroup('common'); await RES.loadGroup('common');
await RES.loadGroup('index_scene'); await RES.loadGroup('main_scene');
// GDispatcher.dispatchEvent('progress', [100]); // GDispatcher.dispatchEvent('progress', [100]);
} }
} }
......
egret/src/Panels/SellPanel.ts
View file @ 531a0edc
...@@ -2,7 +2,7 @@ import Panel from "../views/Panel"; ...@@ -2,7 +2,7 @@ import Panel from "../views/Panel";
import { spData } from "./WareHousePanel"; import { spData } from "./WareHousePanel";
import { NetManager } from "../../libs/tw/manager/NetManager"; import { NetManager } from "../../libs/tw/manager/NetManager";
import { ProgressNum } from "../components/ProgressNum"; import { ProgressNum } from "../components/ProgressNum";
import { IndexDispatcher } from "../Scenes/IndexScene/IndexScene"; import { MainDispatcher } from "../Scenes/IndexScene/MainScene";
import PanelCtrl from "../ctrls/panelCtrl"; import PanelCtrl from "../ctrls/panelCtrl";
import { ModuleTypes } from "../types/sceneTypes"; import { ModuleTypes } from "../types/sceneTypes";
import TopLayerCtrl from "../ctrls/topLayerCtrl"; import TopLayerCtrl from "../ctrls/topLayerCtrl";
...@@ -48,7 +48,7 @@ export default class SellPanel extends Panel { ...@@ -48,7 +48,7 @@ export default class SellPanel extends Panel {
super.start(); super.start();
this.initUI(); this.initUI();
IndexDispatcher.addEvent('updateSellValue', this.updateSellValue, this); MainDispatcher.addEvent('updateSellValue', this.updateSellValue, this);
} }
private updateSellValue() { private updateSellValue() {
......
egret/src/Panels/SelledPanel.ts
View file @ 531a0edc
import Panel from "../views/Panel"; import Panel from "../views/Panel";
import { IndexDispatcher } from "../Scenes/IndexScene/IndexScene"; import { MainDispatcher } from "../Scenes/IndexScene/MainScene";
export default class SelledPanel extends Panel { export default class SelledPanel extends Panel {
public closeBtn: eui.Image; public closeBtn: eui.Image;
...@@ -29,12 +29,12 @@ export default class SelledPanel extends Panel { ...@@ -29,12 +29,12 @@ export default class SelledPanel extends Panel {
this.initUI(); this.initUI();
this.okBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchClose, this); this.okBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchClose, this);
IndexDispatcher.dispatchEvent('updateWareHouse'); MainDispatcher.dispatchEvent('updateWareHouse');
} }
onTouchClose(): any { onTouchClose(): any {
IndexDispatcher.dispatchEvent('closeWareHouse'); MainDispatcher.dispatchEvent('closeWareHouse');
IndexDispatcher.dispatchEvent('addGold'); MainDispatcher.dispatchEvent('addGold');
super.onTouchClose(); super.onTouchClose();
} }
......
egret/src/Panels/TaskPanel.ts
View file @ 531a0edc
...@@ -3,7 +3,7 @@ import { getSkinPath } from "../utils"; ...@@ -3,7 +3,7 @@ import { getSkinPath } from "../utils";
import TopLayerCtrl from "../ctrls/topLayerCtrl"; import TopLayerCtrl from "../ctrls/topLayerCtrl";
import { ModuleTypes } from "../types/sceneTypes"; import { ModuleTypes } from "../types/sceneTypes";
import { NetManager } from "../../libs/tw/manager/NetManager"; import { NetManager } from "../../libs/tw/manager/NetManager";
import { IndexDispatcher } from "../Scenes/IndexScene/IndexScene"; import { MainDispatcher } from "../Scenes/IndexScene/MainScene";
import { getlogItem } from "../comm/getlogItem"; import { getlogItem } from "../comm/getlogItem";
let taskUi = { let taskUi = {
...@@ -61,12 +61,12 @@ export default class TaskPanel extends Panel { ...@@ -61,12 +61,12 @@ export default class TaskPanel extends Panel {
} }
private initUI(): void { private initUI(): void {
IndexDispatcher.addEvent('getTaskInfo', this.getTaskInfo, this); MainDispatcher.addEvent('getTaskInfo', this.getTaskInfo, this);
this.getTaskInfo(); this.getTaskInfo();
} }
destroy() { destroy() {
IndexDispatcher.removeEvent('getTaskInfo', this.getTaskInfo, this); MainDispatcher.removeEvent('getTaskInfo', this.getTaskInfo, this);
super.destroy(); super.destroy();
} }
...@@ -140,8 +140,8 @@ class TaskItem extends eui.ItemRenderer { ...@@ -140,8 +140,8 @@ class TaskItem extends eui.ItemRenderer {
food: this.data.spFood1RewardNum, food: this.data.spFood1RewardNum,
water: this.data.spFood2RewardNum, water: this.data.spFood2RewardNum,
}); });
IndexDispatcher.dispatchEvent('getTaskInfo'); MainDispatcher.dispatchEvent('getTaskInfo');
IndexDispatcher.dispatchEvent('getPropInfo'); MainDispatcher.dispatchEvent('getPropInfo');
}; };
if(this.data.status == 0) { if(this.data.status == 0) {
...@@ -161,8 +161,8 @@ class TaskItem extends eui.ItemRenderer { ...@@ -161,8 +161,8 @@ class TaskItem extends eui.ItemRenderer {
_f(); _f();
}, 3000)) : _f(); }, 3000)) : _f();
} else { } else {
IndexDispatcher.dispatchEvent('getTaskInfo'); MainDispatcher.dispatchEvent('getTaskInfo');
IndexDispatcher.dispatchEvent('getPropInfo'); MainDispatcher.dispatchEvent('getPropInfo');
window.location.href = taskUi[this.data.id].link; window.location.href = taskUi[this.data.id].link;
} }
}, this.data.id); }, this.data.id);
......
egret/src/Panels/WareHousePanel.ts
View file @ 531a0edc
...@@ -4,7 +4,7 @@ import { ModuleTypes } from "../types/sceneTypes"; ...@@ -4,7 +4,7 @@ import { ModuleTypes } from "../types/sceneTypes";
import { NetManager } from "../../libs/tw/manager/NetManager"; import { NetManager } from "../../libs/tw/manager/NetManager";
import { btnDelay, showToast } from "../comm/UtilsConst"; import { btnDelay, showToast } from "../comm/UtilsConst";
import PanelCtrl from "../ctrls/panelCtrl"; import PanelCtrl from "../ctrls/panelCtrl";
import { IndexDispatcher } from "../Scenes/IndexScene/IndexScene"; import { MainDispatcher } from "../Scenes/IndexScene/MainScene";
import { getlogItem } from "../comm/getlogItem"; import { getlogItem } from "../comm/getlogItem";
export let spData = { export let spData = {
...@@ -97,8 +97,8 @@ export default class WareHousePanel extends Panel { ...@@ -97,8 +97,8 @@ export default class WareHousePanel extends Panel {
private initUI(): void { private initUI(): void {
this.getWareHouseInfo(); this.getWareHouseInfo();
IndexDispatcher.addEvent('updateWareHouse', this.getWareHouseInfo, this); MainDispatcher.addEvent('updateWareHouse', this.getWareHouseInfo, this);
IndexDispatcher.addEvent('closeWareHouse', this.onTouchClose, this); MainDispatcher.addEvent('closeWareHouse', this.onTouchClose, this);
} }
onTouchClose(): any { onTouchClose(): any {
...@@ -107,8 +107,8 @@ export default class WareHousePanel extends Panel { ...@@ -107,8 +107,8 @@ export default class WareHousePanel extends Panel {
destroy() { destroy() {
super.destroy(); super.destroy();
IndexDispatcher.removeEvent('updateWareHouse', this.getWareHouseInfo, this); MainDispatcher.removeEvent('updateWareHouse', this.getWareHouseInfo, this);
IndexDispatcher.removeEvent('closeWareHouse', this.onTouchClose, this); MainDispatcher.removeEvent('closeWareHouse', this.onTouchClose, this);
} }
private getWareHouseInfo() { private getWareHouseInfo() {
......
egret/src/Scenes/IndexScene/LandMgr.ts
View file @ 531a0edc
import Land from "./Objs/Land"; import Land from "./Objs/Land";
import { IndexDispatcher, IndexIns } from "./IndexScene"; import { MainDispatcher, MainIns } from "./MainScene";
import { NetManager } from "../../../libs/tw/manager/NetManager"; import { NetManager } from "../../../libs/tw/manager/NetManager";
import { GDispatcher } from "../../../libs/tc/util/GDispatcher"; import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
import { loadSvga } from "../../comm/loadSvga"; import { loadSvga } from "../../comm/loadSvga";
import { getSvga } from "../../utils"; import { getSvga } from "../../utils";
import M_EVENT from "./MSceneEnum";
/** /**
* 示意图 * 示意图
...@@ -41,22 +42,21 @@ export default class LandMgr { ...@@ -41,22 +42,21 @@ export default class LandMgr {
this.getLandInfo(); this.getLandInfo();
} }
private initEvents() {
MainDispatcher.addEvent(M_EVENT.HIDE_OPTION, this.reActiveAll, this);
GDispatcher.addEvent('docVisible', this.updateLandInfo, this);
MainDispatcher.addEvent(M_EVENT.UPDATE_LANDS, this.updateLandInfo, this);
MainDispatcher.addEvent(M_EVENT.PLANT, this.plant, this);
}
public destroy() { public destroy() {
IndexDispatcher.removeEvent('hideOption', this.reActiveAll, this); MainDispatcher.removeEvent(M_EVENT.HIDE_OPTION, this.reActiveAll, this);
GDispatcher.removeEvent('docVisible', this.updateLandInfo, this); GDispatcher.removeEvent('docVisible', this.updateLandInfo, this);
IndexDispatcher.removeEvent('updateIndex', this.updateLandInfo, this); MainDispatcher.removeEvent(M_EVENT.UPDATE_LANDS, this.updateLandInfo, this);
IndexDispatcher.removeEvent('plant', this.plant, this); MainDispatcher.removeEvent(M_EVENT.PLANT, this.plant, this);
this.lands.forEach(v => v.destroy()); this.lands.forEach(v => v.destroy());
} }
private initEvents() {
IndexDispatcher.addEvent('hideOption', this.reActiveAll, this);
GDispatcher.addEvent('docVisible', this.updateLandInfo, this);
IndexDispatcher.addEvent('updateIndex', this.updateLandInfo, this);
IndexDispatcher.addEvent('plant', this.plant, this);
}
private plant(data) { private plant(data) {
this.lands[data.landId - 1].plant(data); this.lands[data.landId - 1].plant(data);
} }
...@@ -72,7 +72,7 @@ export default class LandMgr { ...@@ -72,7 +72,7 @@ export default class LandMgr {
private addLand(data) { private addLand(data) {
for(let v of data) { for(let v of data) {
let newLand = new Land({data: v, index: v.id, x: landPos[v.id - 1].x, y: landPos[v.id - 1].y}); let newLand = new Land({data: v, index: v.id, x: landPos[v.id - 1].x, y: landPos[v.id - 1].y});
IndexIns().gameLayer.addChildAt(newLand, v.id); MainIns().gameLayer.addChildAt(newLand, v.id);
this.lands.push(newLand); // 加入数组方便管理 this.lands.push(newLand); // 加入数组方便管理
} }
loadSvga(getSvga('流水动效')).then( loadSvga(getSvga('流水动效')).then(
...@@ -80,7 +80,7 @@ export default class LandMgr { ...@@ -80,7 +80,7 @@ export default class LandMgr {
mv.x = 550; mv.x = 550;
mv.y = 865; mv.y = 865;
mv.touchEnabled = false; mv.touchEnabled = false;
IndexIns().gameLayer.addChildAt(mv, 3); MainIns().gameLayer.addChildAt(mv, 3);
} }
) )
} }
...@@ -106,4 +106,14 @@ export default class LandMgr { ...@@ -106,4 +106,14 @@ export default class LandMgr {
} }
}); });
} }
} }
\ No newline at end of file
const M_UpdateLand = function() {
MainDispatcher.dispatchEvent(M_EVENT.UPDATE_LANDS);
};
const M_Plant = function(data: { landId: number, petId: number }) {
MainDispatcher.dispatchEvent(M_EVENT.PLANT, data);
};
export { M_UpdateLand, M_Plant }
egret/src/Scenes/IndexScene/MSceneEnum.ts 0 → 100644
View file @ 531a0edc
enum M_EVENT {
UPDATE_LANDS,
HIDE_OPTION,
SHOW_OPTION,
PLANT,
}
export default M_EVENT;
\ No newline at end of file
egret/src/Scenes/IndexScene/IndexScene.ts → egret/src/Scenes/IndexScene/MainScene.ts
View file @ 531a0edc
import Scene from "../../views/Scene"; import Scene from "../../views/Scene";
import IndexUI from "./IndexUI"; import MainUI from "./MainUI";
import LandMgr from "./LandMgr"; import LandMgr from "./LandMgr";
import OptionPanel, { GDispatchHideOption } from "./Objs/OptionPanel"; import OptionPanel, { M_HideOption } from "./Objs/OptionPanel";
import Dispatcher from "../../comm/Dispatcher"; import Dispatcher from "../../comm/Dispatcher";
import ProgressMgr from "./ProgressMgr"; import ProgressMgr from "./ProgressMgr";
////////////////// Instance ////////////////// ////////////////// Instance //////////////////
let instance: IndexScene = null; let instance: MainScene = null;
const IndexIns = function(): IndexScene { const MainIns = function(): MainScene {
return instance; return instance;
}; };
const SetIndexInstance = function(ins: IndexScene) { const SetMainInstance = function(ins: MainScene) {
instance = ins; instance = ins;
}; };
const DestroyIndexInstance = function() { const DestroyMainInstance = function() {
instance = null; instance = null;
}; };
let canUpdate = true; let canUpdate = true;
const SetGameLayerUpdate = function(enable: boolean) { const M_SetGameLayerUpdate = function(enable: boolean) {
instance.gameLayer.touchEnabled = enable; instance.gameLayer.touchEnabled = enable;
instance.gameLayer.touchChildren = enable; instance.gameLayer.touchChildren = enable;
canUpdate = enable; canUpdate = enable;
}; };
const CanUpdate = function() { const M_CanUpdate = function() {
return canUpdate; return canUpdate;
}; };
export { IndexIns, SetGameLayerUpdate, CanUpdate }; export { MainIns, M_SetGameLayerUpdate, M_CanUpdate };
////////////////// Instance ////////////////// ////////////////// Instance //////////////////
// Index场景的事件收发器 // Index场景的事件收发器
let IndexDispatcher: Dispatcher = null; let MainDispatcher: Dispatcher = null;
export { IndexDispatcher }; export { MainDispatcher };
const NewIndexDispatcher = function() { const NewMainDispatcher = function() {
IndexDispatcher = new Dispatcher() MainDispatcher = new Dispatcher()
}; };
const DestroyDispatcher = function() { const DestroyMainDispatcher = function() {
IndexDispatcher = null; MainDispatcher = null;
}; };
/** /**
* 主场景 * 主场景
* Tips： * Tips：
* 1.在本场景中因为需求坑爹（需要上下居中适配并加固定导航栏），所以进行手动适配 * 1.在本场景中因为需求坑爹（需要上下居中适配并加固定导航栏），所以进行手动适配
* 2.在IndexScene中： * 2.在MainScene中：
* group 为适配层，该层 height = 实际画布高度 * group 为适配层，该层 height = 实际画布高度
* gameLayer 为游戏层，该层在 group 中上下居中 * gameLayer 为游戏层，该层在 group 中上下居中
* 获得高度差可用 gameLayer.height - group.height * 获得高度差可用 gameLayer.height - group.height
* 需要将非 gameLayer 层中对象准确定位可将定位高度减去 上面的值/2 * 需要将非 gameLayer 层中对象准确定位可将定位高度减去 上面的值/2
* 3.使用上面的 IndexIns() 可取得IndexScene的场景单例，该单例在IndexScene场景销毁时会自动销毁，IndexScene场景生成时自动赋值 * 3.使用上面的 MainIns() 可取得IndexScene的场景单例，该单例在MainScene场景销毁时会自动销毁，MainScene场景生成时自动赋值
* 4.使用上面的 IndexDispatcher 可取得独立在IndexScene的场景中的事件收发器单例，该单例在IndexScene场景销毁时会自动销毁，IndexScene场景生成时自动赋值 * 4.使用上面的 MainDispatcher 可取得独立在MainScene的场景中的事件收发器单例，该单例在MainScene场景销毁时会自动销毁，MainScene场景生成时自动赋值
*/ */
export default class IndexScene extends Scene { export default class MainScene extends Scene {
public group: eui.Group; public group: eui.Group;
public bg: eui.Image; public bg: eui.Image;
public gameLayer: eui.Group; public gameLayer: eui.Group;
public indexUI: IndexUI; public mainUI: MainUI;
public optionPanel: OptionPanel; public optionPanel: OptionPanel;
public progressMgr: ProgressMgr; public progressMgr: ProgressMgr;
...@@ -71,8 +71,8 @@ export default class IndexScene extends Scene { ...@@ -71,8 +71,8 @@ export default class IndexScene extends Scene {
protected start() { protected start() {
super.start(); super.start();
SetIndexInstance(this); // 设置单例 SetMainInstance(this); // 设置单例
NewIndexDispatcher(); // 创建一个局部事件收发器 NewMainDispatcher(); // 创建一个局部事件收发器
this.initUI(); this.initUI();
} }
...@@ -80,8 +80,8 @@ export default class IndexScene extends Scene { ...@@ -80,8 +80,8 @@ export default class IndexScene extends Scene {
this.group.height = 750 / window.innerWidth * window.innerHeight; this.group.height = 750 / window.innerWidth * window.innerHeight;
// 创建UI层 // 创建UI层
this.indexUI = new IndexUI(); this.mainUI = new MainUI();
this.addChild(this.indexUI); this.addChild(this.mainUI);
this.gameLayer.touchThrough = true; // 点击穿透。。防止设计touchEnable后无法点击bg this.gameLayer.touchThrough = true; // 点击穿透。。防止设计touchEnable后无法点击bg
...@@ -100,10 +100,10 @@ export default class IndexScene extends Scene { ...@@ -100,10 +100,10 @@ export default class IndexScene extends Scene {
destroy() { destroy() {
super.destroy(); super.destroy();
/// TODO 可能的需要清除的东西 /// TODO 可能的需要清除的东西
DestroyIndexInstance(); // 清除单例 DestroyMainInstance(); // 清除单例
DestroyDispatcher(); // 删除局部收发器 DestroyMainDispatcher(); // 删除局部收发器
OptionPanel.destroy(); OptionPanel.destroy();
this.indexUI.destroy(); this.mainUI.destroy();
this.landMgr.destroy(); this.landMgr.destroy();
} }
...@@ -116,7 +116,7 @@ export default class IndexScene extends Scene { ...@@ -116,7 +116,7 @@ export default class IndexScene extends Scene {
private onTouchTap(e: egret.TouchEvent) { private onTouchTap(e: egret.TouchEvent) {
switch(e.target) { switch(e.target) {
case this.bg: case this.bg:
GDispatchHideOption(); M_HideOption();
break; break;
default: default:
break; break;
...@@ -128,11 +128,11 @@ export default class IndexScene extends Scene { ...@@ -128,11 +128,11 @@ export default class IndexScene extends Scene {
} }
public get skinKey() { public get skinKey() {
return 'IndexScene' return 'MainScene'
} }
public get groupName() { public get groupName() {
return 'index_scene' return 'main_scene'
} }
} }
\ No newline at end of file
egret/src/Scenes/IndexScene/IndexUI.ts → egret/src/Scenes/IndexScene/MainUI.ts
View file @ 531a0edc
import ComponentBase from "../../components/ComponentBase"; import ComponentBase from "../../components/ComponentBase";
import { GDispatchHideOption } from "./Objs/OptionPanel"; import { M_HideOption } from "./Objs/OptionPanel";
import PanelCtrl from "../../ctrls/panelCtrl"; import PanelCtrl from "../../ctrls/panelCtrl";
import { ModuleTypes } from "../../types/sceneTypes"; import { ModuleTypes } from "../../types/sceneTypes";
import { btnDelay, showToast } from "../../comm/UtilsConst"; import { btnDelay, showToast } from "../../comm/UtilsConst";
import { IndexDispatcher, IndexIns } from "./IndexScene"; import { MainDispatcher, MainIns } from "./MainScene";
import { NetManager } from "../../../libs/tw/manager/NetManager"; import { NetManager } from "../../../libs/tw/manager/NetManager";
import { DataManager } from "../../../libs/tw/manager/DataManager"; import { DataManager } from "../../../libs/tw/manager/DataManager";
import { loadSvga } from "../../comm/loadSvga"; import { loadSvga } from "../../comm/loadSvga";
...@@ -15,7 +15,7 @@ export let propData = { ...@@ -15,7 +15,7 @@ export let propData = {
sp_food_2: {name: 'water',}, sp_food_2: {name: 'water',},
}; };
export default class IndexUI extends ComponentBase { export default class MainUI extends ComponentBase {
public uiLayer: eui.Group; public uiLayer: eui.Group;
public propPanel: eui.Group; public propPanel: eui.Group;
public speedGroup: eui.Group; public speedGroup: eui.Group;
...@@ -42,7 +42,7 @@ export default class IndexUI extends ComponentBase { ...@@ -42,7 +42,7 @@ export default class IndexUI extends ComponentBase {
protected getTapEvts(): any[] { protected getTapEvts(): any[] {
return super.getTapEvts().concat([ return super.getTapEvts().concat([
[this, GDispatchHideOption, this], [this, M_HideOption, this],
[this.taskBtn, this.onTap, this], [this.taskBtn, this.onTap, this],
[this.warehouseBtn, this.onTap, this], [this.warehouseBtn, this.onTap, this],
[this.recordBtn, this.onTap, this], [this.recordBtn, this.onTap, this],
...@@ -118,7 +118,7 @@ export default class IndexUI extends ComponentBase { ...@@ -118,7 +118,7 @@ export default class IndexUI extends ComponentBase {
this.uiLayer.height = 750 / window.innerWidth * window.innerHeight; this.uiLayer.height = 750 / window.innerWidth * window.innerHeight;
this.touchEnabled = true; this.touchEnabled = true;
this.houseBtn.y = (this.houseBtn.y - (IndexIns().gameLayer.height - IndexIns().group.height) / 2); this.houseBtn.y = (this.houseBtn.y - (MainIns().gameLayer.height - MainIns().group.height) / 2);
this.avatarImg.mask = this.avatarMask; this.avatarImg.mask = this.avatarMask;
this.getUserInfo(); this.getUserInfo();
...@@ -140,9 +140,9 @@ export default class IndexUI extends ComponentBase { ...@@ -140,9 +140,9 @@ export default class IndexUI extends ComponentBase {
this.warehouseBtn.anchorOffsetX = this.warehouseBtn.width / 2; this.warehouseBtn.anchorOffsetX = this.warehouseBtn.width / 2;
this.warehouseBtn.anchorOffsetY = this.warehouseBtn.height / 2; this.warehouseBtn.anchorOffsetY = this.warehouseBtn.height / 2;
IndexDispatcher.addEvent('warehouseEffect', this.warehouseEffect, this); MainDispatcher.addEvent('warehouseEffect', this.warehouseEffect, this);
IndexDispatcher.addEvent('getPropInfo', this.getPropInfo, this); MainDispatcher.addEvent('getPropInfo', this.getPropInfo, this);
IndexDispatcher.addEvent('addGold', this.addGold, this); MainDispatcher.addEvent('addGold', this.addGold, this);
} }
private addGold() { private addGold() {
...@@ -202,12 +202,16 @@ export default class IndexUI extends ComponentBase { ...@@ -202,12 +202,16 @@ export default class IndexUI extends ComponentBase {
destroy() { destroy() {
super.destroy(); super.destroy();
IndexDispatcher.removeEvent('warehouseEffect', this.warehouseEffect, this); MainDispatcher.removeEvent('warehouseEffect', this.warehouseEffect, this);
IndexDispatcher.removeEvent('getPropInfo', this.getPropInfo, this); MainDispatcher.removeEvent('getPropInfo', this.getPropInfo, this);
IndexDispatcher.removeEvent('addGold', this.addGold, this); MainDispatcher.removeEvent('addGold', this.addGold, this);
} }
get skinKey() { get skinKey() {
return 'IndexUI'; return 'MainUI';
}
public get groupName() {
return 'main_ui';
} }
} }
\ No newline at end of file
egret/src/Scenes/IndexScene/Objs/Crop.ts
View file @ 531a0edc
import { getSkinPath, getSvga } from "../../../utils"; import { getSkinPath, getSvga } from "../../../utils";
import TimeProgressBar from "../TimeProgressBar"; import TimeProgressBar from "../TimeProgressBar";
import { IndexDispatcher, IndexIns, SetGameLayerUpdate } from "../IndexScene"; import { MainDispatcher, MainIns, M_SetGameLayerUpdate } from "../MainScene";
import { loadSvga } from "../../../comm/loadSvga"; import { loadSvga } from "../../../comm/loadSvga";
import { NetManager } from "../../../../libs/tw/manager/NetManager"; import { NetManager } from "../../../../libs/tw/manager/NetManager";
import { showToast } from "../../../comm/UtilsConst"; import { showToast } from "../../../comm/UtilsConst";
import { DataManager } from "../../../../libs/tw/manager/DataManager"; import { DataManager } from "../../../../libs/tw/manager/DataManager";
import { NetName } from "../../../../libs/tw/enum/NetName"; import { M_HideOption } from "./OptionPanel";
import { GDispatchHideOption } from "./OptionPanel"; import { M_UpdateLand } from "../LandMgr";
enum CROP_TYPE { enum CROP_TYPE {
NONE = 0, // 啥也没有 NONE = 0, // 啥也没有
...@@ -93,12 +93,12 @@ export default class Crop extends eui.Component { ...@@ -93,12 +93,12 @@ export default class Crop extends eui.Component {
private reset() { private reset() {
this.progressBar && egret.Tween.removeTweens(this.progressBar); this.progressBar && egret.Tween.removeTweens(this.progressBar);
IndexIns().progressMgr.removeProgress(this.data.index); MainIns().progressMgr.removeProgress(this.data.index);
this.progressBar = null; this.progressBar = null;
} }
public plant(data) { public plant(data) {
SetGameLayerUpdate(false); M_SetGameLayerUpdate(false);
loadSvga(getSvga(`${petData[data.petId].key}_plant`)).then( loadSvga(getSvga(`${petData[data.petId].key}_plant`)).then(
(mv: egret.MovieClip) => { (mv: egret.MovieClip) => {
mv.x = 82; mv.x = 82;
...@@ -107,8 +107,9 @@ export default class Crop extends eui.Component { ...@@ -107,8 +107,9 @@ export default class Crop extends eui.Component {
mv.addEventListener(egret.Event.COMPLETE, () => { mv.addEventListener(egret.Event.COMPLETE, () => {
mv.stop(); mv.stop();
this.removeChild(mv); this.removeChild(mv);
SetGameLayerUpdate(true); M_SetGameLayerUpdate(true);
IndexDispatcher.dispatchEvent('updateIndex'); M_UpdateLand();
// MainDispatcher.dispatchEvent('updateIndex');
}, this); }, this);
} }
) )
...@@ -202,35 +203,35 @@ export default class Crop extends eui.Component { ...@@ -202,35 +203,35 @@ export default class Crop extends eui.Component {
} }
private dOp() { private dOp() {
GDispatchHideOption(); // 隐藏操作面板 M_HideOption(); // 隐藏操作面板
this.doOption(this.option); this.doOption(this.option);
} }
private doOption(option) { private doOption(option) {
switch(option) { switch(option) {
case OPTION.GATHER: case OPTION.GATHER:
SetGameLayerUpdate(false); M_SetGameLayerUpdate(false);
NetManager.ins.doHarvest((success, res) => { NetManager.ins.doHarvest((success, res) => {
if(!success) { if(!success) {
SetGameLayerUpdate(true); M_SetGameLayerUpdate(true);
return; return;
} }
this.cropMv && this.removeChild(this.cropMv) && (this.cropMv = null); this.cropMv && this.removeChild(this.cropMv) && (this.cropMv = null);
let catherImg = new eui.Image(`${petData[this.petId]['catherImg']}_png`); let catherImg = new eui.Image(`${petData[this.petId]['catherImg']}_png`);
let dy = IndexIns().indexUI.height - IndexIns().group.height; let dy = MainIns().mainUI.height - MainIns().group.height;
catherImg.x = IndexIns().landMgr.lands[this.index - 1].x + this.x + 100 + 57 / 2; catherImg.x = MainIns().landMgr.lands[this.index - 1].x + this.x + 100 + 57 / 2;
catherImg.y = IndexIns().landMgr.lands[this.index - 1].y + this.y - dy / 2 + 40 + 63 / 2; catherImg.y = MainIns().landMgr.lands[this.index - 1].y + this.y - dy / 2 + 40 + 63 / 2;
catherImg.anchorOffsetX = 57 / 2; catherImg.anchorOffsetX = 57 / 2;
catherImg.anchorOffsetY = 63 / 2; catherImg.anchorOffsetY = 63 / 2;
catherImg.scaleX = 0; catherImg.scaleX = 0;
catherImg.scaleY = 0; catherImg.scaleY = 0;
IndexIns().indexUI.addChild(catherImg); MainIns().mainUI.addChild(catherImg);
// 移动 // 移动
egret.Tween.get(catherImg).to({y: catherImg.y - 10}, 170).call(() => { egret.Tween.get(catherImg).to({y: catherImg.y - 10}, 170).call(() => {
egret.Tween.get(catherImg).to({y: catherImg.y + 10}, 160, egret.Ease.quadInOut).wait(500).call(() => { egret.Tween.get(catherImg).to({y: catherImg.y + 10}, 160, egret.Ease.quadInOut).wait(500).call(() => {
let _x = IndexIns().indexUI.warehouseBtn.x + 25 + 57 / 2; let _x = MainIns().mainUI.warehouseBtn.x + 25 + 57 / 2;
let _y = IndexIns().indexUI.warehouseBtn.y + 35 + 63 / 2; let _y = MainIns().mainUI.warehouseBtn.y + 35 + 63 / 2;
egret.Tween.get(catherImg).to({x: _x, y: _y}, 680); egret.Tween.get(catherImg).to({x: _x, y: _y}, 680);
}); });
}); });
...@@ -243,10 +244,10 @@ export default class Crop extends eui.Component { ...@@ -243,10 +244,10 @@ export default class Crop extends eui.Component {
// 透明度 // 透明度
egret.Tween.get(catherImg).wait(1470).to({alpha: 0}, 30).call(() => { egret.Tween.get(catherImg).wait(1470).to({alpha: 0}, 30).call(() => {
egret.Tween.removeTweens(catherImg); egret.Tween.removeTweens(catherImg);
IndexIns().indexUI.removeChild(catherImg); MainIns().mainUI.removeChild(catherImg);
SetGameLayerUpdate(true); M_SetGameLayerUpdate(true);
IndexDispatcher.dispatchEvent('updateIndex'); M_UpdateLand();
IndexDispatcher.dispatchEvent('warehouseEffect'); MainDispatcher.dispatchEvent('warehouseEffect');
}); });
this.changePetId(CROP_TYPE.NONE); this.changePetId(CROP_TYPE.NONE);
...@@ -256,11 +257,11 @@ export default class Crop extends eui.Component { ...@@ -256,11 +257,11 @@ export default class Crop extends eui.Component {
break; break;
case OPTION.FEED: case OPTION.FEED:
SetGameLayerUpdate(false); M_SetGameLayerUpdate(false);
let feedNum = this.data.data.feedNum; let feedNum = this.data.data.feedNum;
let haveNum = DataManager.ins.getData(petData[this.petId]['prop']); let haveNum = DataManager.ins.getData(petData[this.petId]['prop']);
if(feedNum > haveNum) { if(feedNum > haveNum) {
SetGameLayerUpdate(true); M_SetGameLayerUpdate(true);
let msg = ((petData[this.petId]['prop'] == 'food') ? '饲料' : '水壶') + '不够了，快去做任务吧'; let msg = ((petData[this.petId]['prop'] == 'food') ? '饲料' : '水壶') + '不够了，快去做任务吧';
showToast(msg); showToast(msg);
} else { } else {
...@@ -269,7 +270,7 @@ export default class Crop extends eui.Component { ...@@ -269,7 +270,7 @@ export default class Crop extends eui.Component {
if(!success) { if(!success) {
let msg = ((petData[this.petId]['prop'] == 'food') ? '饲料' : '水壶') + '不够了，快去做任务吧'; let msg = ((petData[this.petId]['prop'] == 'food') ? '饲料' : '水壶') + '不够了，快去做任务吧';
showToast(msg); showToast(msg);
SetGameLayerUpdate(true); M_SetGameLayerUpdate(true);
return; return;
} }
this.optionMv && this.removeChild(this.optionMv) && (this.optionMv = null); this.optionMv && this.removeChild(this.optionMv) && (this.optionMv = null);
...@@ -281,14 +282,14 @@ export default class Crop extends eui.Component { ...@@ -281,14 +282,14 @@ export default class Crop extends eui.Component {
mv.addEventListener(egret.Event.COMPLETE, () => { mv.addEventListener(egret.Event.COMPLETE, () => {
mv.stop(); mv.stop();
this.removeChild(mv); this.removeChild(mv);
SetGameLayerUpdate(true); M_SetGameLayerUpdate(true);
this.changeOption(OPTION.NONE); this.changeOption(OPTION.NONE);
IndexDispatcher.dispatchEvent('updateIndex'); M_UpdateLand();
this.showP = true; this.showP = true;
}, this); }, this);
} }
); );
IndexDispatcher.dispatchEvent('getPropInfo'); MainDispatcher.dispatchEvent('getPropInfo');
}, this.index); }, this.index);
} }
break; break;
...@@ -394,7 +395,7 @@ export default class Crop extends eui.Component { ...@@ -394,7 +395,7 @@ export default class Crop extends eui.Component {
} else { } else {
label = (this.state == 3) ? '收获' : '浇水'; label = (this.state == 3) ? '收获' : '浇水';
} }
this.progressBar = IndexIns().progressMgr.addProgress({ this.progressBar = MainIns().progressMgr.addProgress({
index: this.data.index, index: this.data.index,
x: this.data.x + 88, x: this.data.x + 88,
y: this.data.y + 193, y: this.data.y + 193,
......
egret/src/Scenes/IndexScene/Objs/Land.ts
View file @ 531a0edc
import { getSkinPath } from "../../../utils"; import { getSkinPath } from "../../../utils";
import Crop from "./Crop"; import Crop from "./Crop";
import { IndexDispatcher } from "../IndexScene";
import { NetManager } from "../../../../libs/tw/manager/NetManager"; import { NetManager } from "../../../../libs/tw/manager/NetManager";
import { getlogItem } from "../../../comm/getlogItem"; import { getlogItem } from "../../../comm/getlogItem";
import { GDispatchHideOption } from "./OptionPanel"; import { M_HideOption, M_ShowOption } from "./OptionPanel";
enum LAND_STATE { enum LAND_STATE {
...@@ -95,12 +94,12 @@ export default class Land extends eui.Component { ...@@ -95,12 +94,12 @@ export default class Land extends eui.Component {
private onTap() { private onTap() {
console.log(`点击了第${this.index}块土地, 当前状态是${this.state}`); console.log(`点击了第${this.index}块土地, 当前状态是${this.state}`);
if(this.state != LAND_STATE.NONE) { if(this.state != LAND_STATE.NONE) {
// GDispatchHideOption(); // M_HideOption();
return; return;
} }
// 显示Option // 显示Option
NetManager.ins.clickLog(getlogItem(this.index + 7)); // 8, 9, 10, 11 NetManager.ins.clickLog(getlogItem(this.index + 7)); // 8, 9, 10, 11
IndexDispatcher.dispatchEvent('showOption', {index: this.index, pos: {x: this.x, y: this.y}}); M_ShowOption({index: this.index, pos: {x: this.x, y: this.y}});
this.changeState(LAND_STATE.ACTIVE); this.changeState(LAND_STATE.ACTIVE);
} }
......
egret/src/Scenes/IndexScene/Objs/OptionPanel.ts
View file @ 531a0edc
import { getSkinPath } from "../../../utils"; import { getSkinPath } from "../../../utils";
import { IndexDispatcher, IndexIns, SetGameLayerUpdate } from "../IndexScene"; import { MainDispatcher, MainIns, M_SetGameLayerUpdate } from "../MainScene";
import { NetManager } from "../../../../libs/tw/manager/NetManager"; import { NetManager } from "../../../../libs/tw/manager/NetManager";
import { btnDelay } from "../../../comm/UtilsConst"; import { btnDelay } from "../../../comm/UtilsConst";
import { M_Plant } from "../LandMgr";
import M_EVENT from "../MSceneEnum";
// 触发Option隐藏 // 触发Option隐藏
const GDispatchHideOption = function() { const M_HideOption = function() {
IndexDispatcher.dispatchEvent('hideOption'); MainDispatcher.dispatchEvent(M_EVENT.HIDE_OPTION);
}; };
export { GDispatchHideOption }; // 显示Option
const M_ShowOption = function(data: { index: number, pos: { x: number, y: number } }) {
MainDispatcher.dispatchEvent(M_EVENT.SHOW_OPTION, data);
};
export { M_HideOption, M_ShowOption };
/** /**
...@@ -27,6 +33,7 @@ export default class OptionPanel extends eui.Component { ...@@ -27,6 +33,7 @@ export default class OptionPanel extends eui.Component {
} }
public static destroy() { public static destroy() {
this._instance.removeEvents();
this._instance = null; this._instance = null;
} }
...@@ -44,19 +51,26 @@ export default class OptionPanel extends eui.Component { ...@@ -44,19 +51,26 @@ export default class OptionPanel extends eui.Component {
private initEvents() { private initEvents() {
this.wheatBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap, this); this.wheatBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap, this);
this.chickBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap, this); this.chickBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap, this);
IndexDispatcher.addEvent('showOption', this.showOption, this); MainDispatcher.addEvent(M_EVENT.SHOW_OPTION, this.showOption, this);
IndexDispatcher.addEvent('hideOption', this.hideOption, this); MainDispatcher.addEvent(M_EVENT.HIDE_OPTION, this.hideOption, this);
}
private removeEvents() {
this.wheatBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap, this);
this.chickBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap, this);
MainDispatcher.removeEvent(M_EVENT.SHOW_OPTION, this.showOption, this);
MainDispatcher.removeEvent(M_EVENT.HIDE_OPTION, this.hideOption, this);
} }
private showOption(data?) { private showOption(data?) {
console.log(data); console.log(data);
this.data = data; this.data = data;
IndexDispatcher.dispatchEvent("hideOption"); // 先触发隐藏，保证地块正常显示 M_HideOption(); // 先触发隐藏，保证地块正常显示
this.visible = true; this.visible = true;
this.touchEnabled = true; this.touchEnabled = true;
this.touchChildren = true; this.touchChildren = true;
this.x = data.pos.x + 190; this.x = data.pos.x + 190;
this.y = data.pos.y + 90 - (IndexIns().gameLayer.height - IndexIns().group.height) / 2; this.y = data.pos.y + 90 - (MainIns().gameLayer.height - MainIns().group.height) / 2;
egret.Tween.removeTweens(this); egret.Tween.removeTweens(this);
egret.Tween.get(this).set({alpha: 0}).to({alpha: 1}, 170); egret.Tween.get(this).set({alpha: 0}).to({alpha: 1}, 170);
egret.Tween.get(this).set({scaleX: 0, scaleY: 0}).to({scaleX: 1, scaleY: 1}, 500, egret.Ease.backOut); egret.Tween.get(this).set({scaleX: 0, scaleY: 0}).to({scaleX: 1, scaleY: 1}, 500, egret.Ease.backOut);
...@@ -94,15 +108,15 @@ export default class OptionPanel extends eui.Component { ...@@ -94,15 +108,15 @@ export default class OptionPanel extends eui.Component {
// 0s（100%,100%）-0.1s(120%,120%)-0.2s(100%,100%) // 0s（100%,100%）-0.1s(120%,120%)-0.2s(100%,100%)
egret.Tween.get(target).to({scaleX: 1.2, scaleY: 1.2}, 100, egret.Ease.quadIn).call(() => { egret.Tween.get(target).to({scaleX: 1.2, scaleY: 1.2}, 100, egret.Ease.quadIn).call(() => {
egret.Tween.get(target).to({scaleX: 1, scaleY: 1}, 100, egret.Ease.quadOut).call(() => { egret.Tween.get(target).to({scaleX: 1, scaleY: 1}, 100, egret.Ease.quadOut).call(() => {
IndexDispatcher.dispatchEvent('hideOption'); M_HideOption();
console.log(this.data.index, petId); console.log(this.data.index, petId);
SetGameLayerUpdate(false); M_SetGameLayerUpdate(false);
NetManager.ins.doPlant((success, res) => { NetManager.ins.doPlant((success, res) => {
if(!success) { if(!success) {
SetGameLayerUpdate(true); M_SetGameLayerUpdate(true);
return; return;
} }
IndexDispatcher.dispatchEvent('plant', {landId: this.data.index, petId: petId}); M_Plant({landId: this.data.index, petId: petId});
}, this.data.index, petId); }, this.data.index, petId);
}) })
}) })
......
egret/src/Scenes/IndexScene/ProgressMgr.ts
View file @ 531a0edc
import TimeProgressBar from "./TimeProgressBar"; import TimeProgressBar from "./TimeProgressBar";
import { IndexIns } from "./IndexScene"; import { MainIns } from "./MainScene";
export default class ProgressMgr { export default class ProgressMgr {
...@@ -15,7 +15,7 @@ export default class ProgressMgr { ...@@ -15,7 +15,7 @@ export default class ProgressMgr {
let progressBar = new TimeProgressBar(index, title, label, sTime, nTime, eTime); let progressBar = new TimeProgressBar(index, title, label, sTime, nTime, eTime);
progressBar.x = x; progressBar.x = x;
progressBar.y = y; progressBar.y = y;
IndexIns().gameLayer.addChildAt(progressBar, 80); MainIns().gameLayer.addChildAt(progressBar, 80);
this.progressBars[index] = progressBar; this.progressBars[index] = progressBar;
return progressBar; return progressBar;
...@@ -24,7 +24,7 @@ export default class ProgressMgr { ...@@ -24,7 +24,7 @@ export default class ProgressMgr {
public removeProgress(index) { public removeProgress(index) {
if(this.progressBars[index]) { if(this.progressBars[index]) {
this.progressBars[index].destroy(); this.progressBars[index].destroy();
IndexIns().gameLayer.removeChild(this.progressBars[index]); MainIns().gameLayer.removeChild(this.progressBars[index]);
this.progressBars[index] = null; this.progressBars[index] = null;
delete this.progressBars[index]; delete this.progressBars[index];
} }
......
egret/src/Scenes/IndexScene/TimeProgressBar.ts
View file @ 531a0edc
import { getSkinPath } from "../../utils"; import { getSkinPath } from "../../utils";
import { CanUpdate, IndexDispatcher } from "./IndexScene"; import { M_CanUpdate } from "./MainScene";
import { M_UpdateLand } from "./LandMgr";
import { M_HideOption } from "./Objs/OptionPanel";
export default class TimeProgressBar extends eui.Component { export default class TimeProgressBar extends eui.Component {
public bg: eui.Rect; public bg: eui.Rect;
...@@ -29,16 +31,10 @@ export default class TimeProgressBar extends eui.Component { ...@@ -29,16 +31,10 @@ export default class TimeProgressBar extends eui.Component {
this.endTime = endTime; this.endTime = endTime;
this.progressText = 'hh时mm分后' +label; this.progressText = 'hh时mm分后' +label;
// if(title == '鸡') {
// this.progressText = 'hh时mm分后喂食';
// } else {
// this.progressText = 'hh时mm分后浇水';
// }
this.initUI(); this.initUI();
this.addEventListener(egret.TouchEvent.TOUCH_TAP, () => { this.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
IndexDispatcher.dispatchEvent('hideOption'); M_HideOption();
}, this) }, this)
} }
...@@ -73,7 +69,7 @@ export default class TimeProgressBar extends eui.Component { ...@@ -73,7 +69,7 @@ export default class TimeProgressBar extends eui.Component {
public stop() { public stop() {
console.log('stop'); console.log('stop');
this._timer && this._timer.stop(); this._timer && this._timer.stop();
CanUpdate() && IndexDispatcher.dispatchEvent('updateIndex'); M_CanUpdate() && M_UpdateLand();
} }
public destroy() { public destroy() {
......
egret/src/Scenes/loadingScene/LoadingScene.ts
View file @ 531a0edc
...@@ -69,7 +69,7 @@ export default class LoadingScene extends Scene { ...@@ -69,7 +69,7 @@ export default class LoadingScene extends Scene {
if(v >= 100) { if(v >= 100) {
Loading.instace.hide(); Loading.instace.hide();
//this.goLastScene() //this.goLastScene()
SceneCtrl.instance.change(ModuleTypes.INDEX_SCENE); SceneCtrl.instance.change(ModuleTypes.MAIN_SCENE);
} }
}, 500); }, 500);
this.lastVal = v; this.lastVal = v;
......
egret/src/ThemeAdapter.ts
View file @ 531a0edc
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
// THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS // THIS SOFTWARE IS PROVIDED BY EGRET AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES // OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. // OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
// IN NO EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, // IN NO M_EVENT SHALL EGRET AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA, // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;LOSS OF USE, DATA,
// OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF // OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
...@@ -69,5 +69,5 @@ export default class ThemeAdapter implements eui.IThemeAdapter { ...@@ -69,5 +69,5 @@ export default class ThemeAdapter implements eui.IThemeAdapter {
} }
} }
declare var generateEUI: { paths: string[], skins: any } declare var generateEUI: { paths: string[], skins: any };
declare var generateEUI2: { paths: string[], skins: any } declare var generateEUI2: { paths: string[], skins: any };
\ No newline at end of file \ No newline at end of file
egret/src/comm/Dispatcher.ts
View file @ 531a0edc
...@@ -11,14 +11,14 @@ export default class Dispatcher { ...@@ -11,14 +11,14 @@ export default class Dispatcher {
* 事件作用域池 * 事件作用域池
*/ */
private thisObjPool: any = {}; private thisObjPool: any = {};
/** /**
* *
* @param name 事件名 * @param name 事件名
* @param callback 回调 * @param callback 回调
* @param thisObj 作用域 * @param thisObj 作用域
*/ */
public addEvent(name: string, callback, thisObj: any): void { public addEvent(name: string | number, callback, thisObj: any): void {
if(!this.callbackPool[name]) { if(!this.callbackPool[name]) {
this.callbackPool[name] = []; this.callbackPool[name] = [];
this.thisObjPool[name] = []; this.thisObjPool[name] = [];
...@@ -41,7 +41,7 @@ export default class Dispatcher { ...@@ -41,7 +41,7 @@ export default class Dispatcher {
* @param callback 回调 * @param callback 回调
* @param thisObj 作用域 * @param thisObj 作用域
*/ */
public removeEvent(name: string, callback, thisObj?: any): void { public removeEvent(name: string | number, callback, thisObj?: any): void {
if(this.callbackPool[name]) { if(this.callbackPool[name]) {
const index: number = this.callbackPool[name].indexOf(callback); const index: number = this.callbackPool[name].indexOf(callback);
if(index != -1) { if(index != -1) {
...@@ -56,7 +56,7 @@ export default class Dispatcher { ...@@ -56,7 +56,7 @@ export default class Dispatcher {
* @param name 事件名 * @param name 事件名
* @param args 任意参数 * @param args 任意参数
*/ */
public dispatchEvent(name: string, ...args): void { public dispatchEvent(name: string | number, ...args): void {
const callbacks: Function[] = this.callbackPool[name]; const callbacks: Function[] = this.callbackPool[name];
const thisObjs: any = this.thisObjPool[name]; const thisObjs: any = this.thisObjPool[name];
if(callbacks) { if(callbacks) {
......
egret/src/components/ProgressNum.ts
View file @ 531a0edc
import { getSkinPath } from "../utils"; import { getSkinPath } from "../utils";
import { MainStage } from "../Main"; import { MainStage } from "../Main";
import { IndexDispatcher } from "../Scenes/IndexScene/IndexScene"; import { MainDispatcher } from "../Scenes/IndexScene/MainScene";
export class ProgressNum extends eui.Component { export class ProgressNum extends eui.Component {
public numLabel:eui.Label; public numLabel:eui.Label;
...@@ -57,7 +57,7 @@ export class ProgressNum extends eui.Component { ...@@ -57,7 +57,7 @@ export class ProgressNum extends eui.Component {
this.number = ~~(this.hand.x / aWidth) + 1; // * (this.total) + 1); this.number = ~~(this.hand.x / aWidth) + 1; // * (this.total) + 1);
this.setNumber(); this.setNumber();
IndexDispatcher.dispatchEvent('updateSellValue'); MainDispatcher.dispatchEvent('updateSellValue');
} }
private setNumber() { private setNumber() {
......
egret/src/types/Scenes.ts
View file @ 531a0edc
import { ModuleTypes } from "./sceneTypes"; import { ModuleTypes } from "./sceneTypes";
import IndexScene from "../Scenes/IndexScene/IndexScene"; import MainScene from "../Scenes/IndexScene/MainScene";
import LoadingScene from "../Scenes/loadingScene/LoadingScene"; import LoadingScene from "../Scenes/loadingScene/LoadingScene";
import RulePanel from "../Panels/RulePanel/RulePanel"; import RulePanel from "../Panels/RulePanel/RulePanel";
import TaskPanel from "../Panels/TaskPanel"; import TaskPanel from "../Panels/TaskPanel";
...@@ -12,7 +12,7 @@ import SelledPanel from "../Panels/SelledPanel"; ...@@ -12,7 +12,7 @@ import SelledPanel from "../Panels/SelledPanel";
let Scenes = [ let Scenes = [
[ModuleTypes.LOADING_SCENE, LoadingScene], [ModuleTypes.LOADING_SCENE, LoadingScene],
[ModuleTypes.INDEX_SCENE, IndexScene], [ModuleTypes.MAIN_SCENE, MainScene],
]; ];
let Panels = [ let Panels = [
......
egret/src/types/sceneTypes.ts
View file @ 531a0edc
...@@ -4,7 +4,7 @@ export enum ModuleTypes { ...@@ -4,7 +4,7 @@ export enum ModuleTypes {
ALERT_PANEL, ALERT_PANEL,
/// ///
INDEX_SCENE, MAIN_SCENE,
RULE_PANEL, RULE_PANEL,
NO_NETWORK_PANEL, NO_NETWORK_PANEL,
TASK_PANEL, TASK_PANEL,
......
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