Skip to content

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

换了点皮

parent 70a96fe6
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 67 deletions
.idea/workspace.xml
View file @ 0e3b554b
...@@ -2,46 +2,16 @@ ...@@ -2,46 +2,16 @@
<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$/resource/map/map_check1_0.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_2.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_3.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_4.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_5.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_6.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_7.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_8.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check1_9.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_0.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_2.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_3.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_4.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_5.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_6.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_7.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_8.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resource/map/map_check2_9.png" 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$/mock/miniTb/feile.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.getActivityBaseInfoById.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/mock/miniTb/feile.getActivityBaseInfoById.json" beforeDir="false" afterPath="$PROJECT_DIR$/mock/miniTb/feile.getActivityBaseInfoById.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_0.png" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/resource/map/map_bg1.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg1.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_1.png" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/resource/map/map_bg2.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg2.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_2.png" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/resource/map/map_bg3.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_bg3.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_3.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_4.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_5.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_6.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_7.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_8.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_9.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_disable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_check_disable.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_enable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_check_enable.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_check_enable_cur.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_check_enable_cur.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_star_disable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_star_disable.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/map/map_star_enable.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/map/map_star_enable.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/CheckBtn.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapBottom.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapBottom.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/scene/map/MapMid.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapMid.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/MapTop.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/map/MapTop.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" />
...@@ -133,7 +103,7 @@ ...@@ -133,7 +103,7 @@
<recent name="$PROJECT_DIR$/lotties" /> <recent name="$PROJECT_DIR$/lotties" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.flushRes"> <component name="RunManager" selected="npm.dev">
<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" />
...@@ -182,8 +152,8 @@ ...@@ -182,8 +152,8 @@
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" /> <item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.buildTS" /> <item itemvalue="npm.buildTS" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
</list> </list>
...@@ -216,14 +186,8 @@ ...@@ -216,14 +186,8 @@
<workItem from="1617345199322" duration="4000" /> <workItem from="1617345199322" duration="4000" />
<workItem from="1617346486921" duration="1232000" /> <workItem from="1617346486921" duration="1232000" />
<workItem from="1617348724978" duration="4857000" /> <workItem from="1617348724978" duration="4857000" />
<workItem from="1617673451602" duration="16480000" /> <workItem from="1617673451602" duration="17243000" />
</task> <workItem from="1617702978246" duration="4620000" />
<task id="LOCAL-00017" summary="m">
<created>1613703466149</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1613703466149</updated>
</task> </task>
<task id="LOCAL-00018" summary="m"> <task id="LOCAL-00018" summary="m">
<created>1613706401083</created> <created>1613706401083</created>
...@@ -561,7 +525,14 @@ ...@@ -561,7 +525,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1617691997838</updated> <updated>1617691997838</updated>
</task> </task>
<option name="localTasksCounter" value="66" /> <task id="LOCAL-00066" summary="换了点皮">
<created>1617700390266</created>
<option name="number" value="00066" />
<option name="presentableId" value="LOCAL-00066" />
<option name="project" value="LOCAL" />
<updated>1617700390266</updated>
</task>
<option name="localTasksCounter" value="67" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
mock/miniTb/feile.getActivityBaseInfoById.json
View file @ 0e3b554b
{ {
"code": "000000", "code": "000000",
"data": { "data": {
"currentLevel": 90, "currentLevel": 99,
"topLevelVisitSuccess": true, "topLevelVisitSuccess": true,
"isDrawTopLevelPrize": false, "isDrawTopLevelPrize": false,
"power": 10, "power": 10,
......
resource/map/map_bg1.jpg
View replaced file @ 70a96fe6 View file @ 0e3b554b
resource/map/map_bg1.jpg

388 KB | W: | H:

resource/map/map_bg1.jpg

402 KB | W: | H:

resource/map/map_bg1.jpg
resource/map/map_bg1.jpg
resource/map/map_bg1.jpg
resource/map/map_bg1.jpg
  • 2-up
  • Swipe
  • Onion skin
src/scene/map/CheckBtn.ts
View file @ 0e3b554b
...@@ -132,12 +132,12 @@ export default class CheckBtn extends Container { ...@@ -132,12 +132,12 @@ export default class CheckBtn extends Container {
// 三个星星 // 三个星星
const star1 = this.addChild(new CheckStar()); const star1 = this.addChild(new CheckStar());
star1.position.set(10, 115); star1.position.set(7, 115);
star1.rotation = 10; star1.rotation = 10;
const star2 = this.addChild(new CheckStar()); const star2 = this.addChild(new CheckStar());
star2.position.set(57, 120); star2.position.set(54, 120);
const star3 = this.addChild(new CheckStar()); const star3 = this.addChild(new CheckStar());
star3.position.set(102, 115); star3.position.set(99, 115);
star3.rotation = -10; star3.rotation = -10;
this.star = [star1, star2, star3]; this.star = [star1, star2, star3];
......
src/scene/map/MapBottom.ts
View file @ 0e3b554b
...@@ -4,13 +4,13 @@ import Point = FYGE.Point; ...@@ -4,13 +4,13 @@ import Point = FYGE.Point;
export default class MapBottom extends MapPart { export default class MapBottom extends MapPart {
public static HEIGHT = 630; public static HEIGHT = 856;
public static totalCount = 2; public static totalCount = 2;
protected btnPos = [ protected btnPos = [
[43, 436], [215, 386],
[208, 187], [404, 79],
]; ];
constructor(data) { constructor(data) {
......
src/scene/map/MapMid.ts
View file @ 0e3b554b
...@@ -4,17 +4,16 @@ import Point = FYGE.Point; ...@@ -4,17 +4,16 @@ import Point = FYGE.Point;
export default class MapMid extends MapPart { export default class MapMid extends MapPart {
public static HEIGHT = 1763; public static HEIGHT = 1290;
public static totalCount = 6; public static totalCount = 5;
protected btnPos = [ protected btnPos = [
[502, 1591], [496, 1074],
[510, 1263], [363, 784],
[357, 1053], [201, 560],
[146, 652], [152, 281],
[287, 281], [256, 63],
[412, 63],
]; ];
constructor(data) { constructor(data) {
......
src/scene/map/MapScene.ts
View file @ 0e3b554b
...@@ -173,7 +173,7 @@ export class MapScene extends Scene { ...@@ -173,7 +173,7 @@ export class MapScene extends Scene {
} }
arr.reverse(); arr.reverse();
const topData = arr.splice(98, MapTop.totalCount); // 得到顶部的数据 const topData = arr.splice(Tools.maxLevel - MapTop.totalCount, MapTop.totalCount); // 得到顶部的数据
const bottomData = arr.splice(0, MapBottom.totalCount); // 得到尾部的数据 const bottomData = arr.splice(0, MapBottom.totalCount); // 得到尾部的数据
const midData = arr; // 剩下的是中间的数据 const midData = arr; // 剩下的是中间的数据
......
src/scene/map/MapTop.ts
View file @ 0e3b554b
...@@ -4,12 +4,13 @@ import Point = FYGE.Point; ...@@ -4,12 +4,13 @@ import Point = FYGE.Point;
export default class MapTop extends MapPart { export default class MapTop extends MapPart {
public static HEIGHT = 852; public static HEIGHT = 1102;
public static totalCount = 1; public static totalCount = 2;
public btnPos = [ public btnPos = [
[225, 694], [416, 902],
[202, 653],
]; ];
constructor(data) { constructor(data) {
......
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