Commit 5649733d authored by haiyoucuv's avatar haiyoucuv

换了点皮

parent 3f72dc9e
...@@ -3,9 +3,20 @@ ...@@ -3,9 +3,20 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" comment=""> <list default="true" id="9cef0552-af3c-4a1c-be1f-dc41ebe5b6db" name="Default Changelist" 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$/src/panels/StartPanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanel.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/common/boomBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/boomBtn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/StartPanelPrize.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/StartPanelPrize.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/common/hammerBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/hammerBtn.png" 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$/resource/common/stepBtn.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/stepBtn.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/guidePropBoom.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/guidePropBoom.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/lightedStar.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/lightedStar.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/main_mapbottom.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/main_mapbottom.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/playBg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/playBg.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/rectLat.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/rectLat.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/table.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/table.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/topBg.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/topBg.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/unlightedStar.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/unlightedStar.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/PlayScene.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/scene/PlayScene.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" />
...@@ -22,6 +33,11 @@ ...@@ -22,6 +33,11 @@
</option> </option>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="master" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="ProjectId" id="1eLguwUxaFZQKdDU4ke9UiiRNrt" /> <component name="ProjectId" id="1eLguwUxaFZQKdDU4ke9UiiRNrt" />
...@@ -467,32 +483,32 @@ ...@@ -467,32 +483,32 @@
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" /> <state x="131" y="123" width="730" height="977" key="DiffContextDialog/30.23.1890.1177@30.23.1890.1177" timestamp="1596165868169" />
<state width="888" height="321" key="GridCell.Tab.0.bottom" timestamp="1596463312309"> <state width="869" height="321" key="GridCell.Tab.0.bottom" timestamp="1600833441653">
<screen x="30" y="23" width="1650" height="1027" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" /> <state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="888" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1596439054570" /> <state width="869" height="321" key="GridCell.Tab.0.bottom/30.23.1890.1177@30.23.1890.1177" timestamp="1600833441653" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" /> <state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" /> <state width="1041" height="321" key="GridCell.Tab.0.bottom/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state width="888" height="321" key="GridCell.Tab.0.center" timestamp="1596463312308"> <state width="869" height="321" key="GridCell.Tab.0.center" timestamp="1600833441652">
<screen x="30" y="23" width="1650" height="1027" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" /> <state width="888" height="321" key="GridCell.Tab.0.center/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="888" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1596439054567" /> <state width="869" height="321" key="GridCell.Tab.0.center/30.23.1890.1177@30.23.1890.1177" timestamp="1600833441652" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" /> <state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" /> <state width="1041" height="321" key="GridCell.Tab.0.center/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918464" />
<state width="888" height="321" key="GridCell.Tab.0.left" timestamp="1596463312308"> <state width="869" height="321" key="GridCell.Tab.0.left" timestamp="1600833441651">
<screen x="30" y="23" width="1650" height="1027" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" /> <state width="888" height="321" key="GridCell.Tab.0.left/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312308" />
<state width="888" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1596439054566" /> <state width="869" height="321" key="GridCell.Tab.0.left/30.23.1890.1177@30.23.1890.1177" timestamp="1600833441651" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" /> <state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577197" />
<state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" /> <state width="1041" height="321" key="GridCell.Tab.0.left/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918463" />
<state width="888" height="321" key="GridCell.Tab.0.right" timestamp="1596463312309"> <state width="869" height="321" key="GridCell.Tab.0.right" timestamp="1600833441652">
<screen x="30" y="23" width="1650" height="1027" /> <screen x="30" y="23" width="1890" height="1177" />
</state> </state>
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" /> <state width="888" height="321" key="GridCell.Tab.0.right/30.23.1650.1027@30.23.1650.1027" timestamp="1596463312309" />
<state width="888" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1596439054569" /> <state width="869" height="321" key="GridCell.Tab.0.right/30.23.1890.1177@30.23.1890.1177" timestamp="1600833441652" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" /> <state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1649.1027@31.23.1649.1027" timestamp="1595590577198" />
<state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" /> <state width="1041" height="321" key="GridCell.Tab.0.right/31.23.1889.1177@31.23.1889.1177" timestamp="1595579918465" />
<state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326"> <state x="82" y="353" key="IDE.errors.dialog" timestamp="1594777965326">
...@@ -540,9 +556,10 @@ ...@@ -540,9 +556,10 @@
</state> </state>
<state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" /> <state x="156" y="286" key="run.anything.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596432664001" />
<state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" /> <state x="157" y="286" key="run.anything.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595475548860" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup" timestamp="1596610144284"> <state x="484" y="220" width="670" height="504" key="search.everywhere.popup" timestamp="1600829323295">
<screen x="30" y="23" width="1890" height="1177" /> <screen x="30" y="23" width="1410" height="877" />
</state> </state>
<state x="484" y="220" width="670" height="504" key="search.everywhere.popup/30.23.1410.877@30.23.1410.877" timestamp="1600829323295" />
<state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596610144284" /> <state x="639" y="288" width="671" height="676" key="search.everywhere.popup/30.23.1890.1177@30.23.1890.1177" timestamp="1596610144284" />
<state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" /> <state x="640" y="288" width="670" height="676" key="search.everywhere.popup/31.23.1889.1177@31.23.1889.1177" timestamp="1595584259535" />
</component> </component>
......
resource/common/boomBtn.png

13 KB | W: | H:

resource/common/boomBtn.png

12 KB | W: | H:

resource/common/boomBtn.png
resource/common/boomBtn.png
resource/common/boomBtn.png
resource/common/boomBtn.png
  • 2-up
  • Swipe
  • Onion skin
resource/common/hammerBtn.png

14 KB | W: | H:

resource/common/hammerBtn.png

10.2 KB | W: | H:

resource/common/hammerBtn.png
resource/common/hammerBtn.png
resource/common/hammerBtn.png
resource/common/hammerBtn.png
  • 2-up
  • Swipe
  • Onion skin
resource/common/stepBtn.png

18 KB | W: | H:

resource/common/stepBtn.png

14.5 KB | W: | H:

resource/common/stepBtn.png
resource/common/stepBtn.png
resource/common/stepBtn.png
resource/common/stepBtn.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/guidePropBoom.png

15.7 KB | W: | H:

resource/playScene/guidePropBoom.png

12 KB | W: | H:

resource/playScene/guidePropBoom.png
resource/playScene/guidePropBoom.png
resource/playScene/guidePropBoom.png
resource/playScene/guidePropBoom.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/lightedStar.png

3.35 KB | W: | H:

resource/playScene/lightedStar.png

2.51 KB | W: | H:

resource/playScene/lightedStar.png
resource/playScene/lightedStar.png
resource/playScene/lightedStar.png
resource/playScene/lightedStar.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/main_mapbottom.png

2.51 KB | W: | H:

resource/playScene/main_mapbottom.png

1.53 KB | W: | H:

resource/playScene/main_mapbottom.png
resource/playScene/main_mapbottom.png
resource/playScene/main_mapbottom.png
resource/playScene/main_mapbottom.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/playBg.jpg

154 KB | W: | H:

resource/playScene/playBg.jpg

365 KB | W: | H:

resource/playScene/playBg.jpg
resource/playScene/playBg.jpg
resource/playScene/playBg.jpg
resource/playScene/playBg.jpg
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/rectLat.png

1.3 KB | W: | H:

resource/playScene/rectLat.png

572 Bytes | W: | H:

resource/playScene/rectLat.png
resource/playScene/rectLat.png
resource/playScene/rectLat.png
resource/playScene/rectLat.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/table.png

57.8 KB | W: | H:

resource/playScene/table.png

59.8 KB | W: | H:

resource/playScene/table.png
resource/playScene/table.png
resource/playScene/table.png
resource/playScene/table.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/topBg.png

74.2 KB | W: | H:

resource/playScene/topBg.png

75.4 KB | W: | H:

resource/playScene/topBg.png
resource/playScene/topBg.png
resource/playScene/topBg.png
resource/playScene/topBg.png
  • 2-up
  • Swipe
  • Onion skin
resource/playScene/unlightedStar.png

3.8 KB | W: | H:

resource/playScene/unlightedStar.png

2.86 KB | W: | H:

resource/playScene/unlightedStar.png
resource/playScene/unlightedStar.png
resource/playScene/unlightedStar.png
resource/playScene/unlightedStar.png
  • 2-up
  • Swipe
  • Onion skin
This diff is collapsed.
This diff is collapsed.
...@@ -104,7 +104,7 @@ export const effectBaseTimes = { ...@@ -104,7 +104,7 @@ export const effectBaseTimes = {
} }
//加载器 //加载器
let svgaParser; let svgaParser;
//三个toast和bonusTime //三个toast和bonusTime
const movieClips = { const movieClips = {
wonderful: null, wonderful: null,
amazing: null, amazing: null,
...@@ -260,7 +260,7 @@ export class PlayScene extends Scene { ...@@ -260,7 +260,7 @@ export class PlayScene extends Scene {
this.addChild(FYGE.Sprite.fromFrame("playBg.jpg")).position.set(0, -layers.stageOffsetY); this.addChild(FYGE.Sprite.fromFrame("playBg.jpg")).position.set(0, -layers.stageOffsetY);
//排版 //排版
//底部背景 //底部背景
this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(0, 10); this.addChild(FYGE.Sprite.fromFrame("topBg.png")).position.set(50, 9);
var commonTextArr = {}; var commonTextArr = {};
for (var i = 0; i < 10; i++)commonTextArr[i] = RES.getRes("scoreNum" + i + ".png"); for (var i = 0; i < 10; i++)commonTextArr[i] = RES.getRes("scoreNum" + i + ".png");
...@@ -494,7 +494,7 @@ export class PlayScene extends Scene { ...@@ -494,7 +494,7 @@ export class PlayScene extends Scene {
imgs.addChild(img); imgs.addChild(img);
} }
imgs.x = -texture.width / 2; imgs.x = -texture.width / 2;
imgs.y = Tool.height / 2 - 10; imgs.y = Tool.height / 2 - 2;
// imgs.cacheAsBitmap = true;//考虑如何缓存到和map一起 // imgs.cacheAsBitmap = true;//考虑如何缓存到和map一起
this.map.addChildAt(imgs, 0); this.map.addChildAt(imgs, 0);
} }
...@@ -2938,4 +2938,4 @@ class SettingBtn extends FYGE.Container { ...@@ -2938,4 +2938,4 @@ class SettingBtn extends FYGE.Container {
sendTbNet(TbNetName.openMusic, { isOn: false }) sendTbNet(TbNetName.openMusic, { isOn: false })
super.destroy() super.destroy()
} }
} }
\ No newline at end of file
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