Skip to content

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

m

parent 8b029eb0
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 20 deletions
.idea/workspace.xml
View file @ e7a70b48
...@@ -3,16 +3,12 @@ ...@@ -3,16 +3,12 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment=""> <list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js" beforeDir="false" afterPath="$PROJECT_DIR$/output.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/output.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/output.js.map" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/common/ele9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele9.png" afterDir="false" /> <change beforePath="$PROJECT_DIR$/resource/common/ele9.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/common/ele9.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ice2.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ice2.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ice3.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ice3.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ice4.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ice4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ice5.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ice5.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/playScene/ice6.png" beforeDir="false" afterPath="$PROJECT_DIR$/resource/playScene/ice6.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resource/res.json" beforeDir="false" afterPath="$PROJECT_DIR$/resource/res.json" 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/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" />
<change beforePath="$PROJECT_DIR$/src/something/anisCall/DoorChangeAni.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/anisCall/DoorChangeAni.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/something/class/Ice.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/something/class/Ice.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" />
...@@ -71,7 +67,7 @@ ...@@ -71,7 +67,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.build">
<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" />
...@@ -121,9 +117,9 @@ ...@@ -121,9 +117,9 @@
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.flushRes" /> <item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
<item itemvalue="npm.buildTS" /> <item itemvalue="npm.buildTS" />
<item itemvalue="npm.dev" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
...@@ -139,7 +135,8 @@ ...@@ -139,7 +135,8 @@
<workItem from="1612577003915" duration="21094000" /> <workItem from="1612577003915" duration="21094000" />
<workItem from="1612662929222" duration="40609000" /> <workItem from="1612662929222" duration="40609000" />
<workItem from="1613698993022" duration="22309000" /> <workItem from="1613698993022" duration="22309000" />
<workItem from="1613785579125" duration="17743000" /> <workItem from="1613785579125" duration="17751000" />
<workItem from="1613958457445" duration="1964000" />
</task> </task>
<task id="LOCAL-00001" summary="斐乐消消乐"> <task id="LOCAL-00001" summary="斐乐消消乐">
<created>1612581213298</created> <created>1612581213298</created>
...@@ -400,7 +397,14 @@ ...@@ -400,7 +397,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1613815472565</updated> <updated>1613815472565</updated>
</task> </task>
<option name="localTasksCounter" value="38" /> <task id="LOCAL-00038" summary="m">
<created>1613817216904</created>
<option name="number" value="00038" />
<option name="presentableId" value="LOCAL-00038" />
<option name="project" value="LOCAL" />
<updated>1613817216904</updated>
</task>
<option name="localTasksCounter" value="39" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
......
resource/common/ele9.png
View replaced file @ 8b029eb0 View file @ e7a70b48
resource/common/ele9.png

11.9 KB | W: | H:

resource/common/ele9.png

9.25 KB | W: | H:

resource/common/ele9.png
resource/common/ele9.png
resource/common/ele9.png
resource/common/ele9.png
  • 2-up
  • Swipe
  • Onion skin
resource/res.json
View file @ e7a70b48
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
"name": "bonus_lottie" "name": "bonus_lottie"
}, },
{ {
"keys": "boomBtn.png,comCloseBtn.png,comm_light.png,e305be55-fdfd-453b-9e6d-41edfe68c0f1.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,ele9的副本.png,hammerBtn.png,panelBgS.png,powerIcon.png,powerImg.png,stepBtn.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,target0.png,target1.png,target2.png,target3.png,target4.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,确定.png,继续闯关大.png,继续闯关小.png", "keys": "boomBtn.png,comCloseBtn.png,comm_light.png,e305be55-fdfd-453b-9e6d-41edfe68c0f1.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,panelBgS.png,powerIcon.png,powerImg.png,stepBtn.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,target0.png,target1.png,target2.png,target3.png,target4.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common" "name": "common"
}, },
{ {
......
src/ResJson.ts
View file @ e7a70b48
...@@ -49,7 +49,7 @@ export const ResJson = { ...@@ -49,7 +49,7 @@ export const ResJson = {
"name": "bonus_lottie" "name": "bonus_lottie"
}, },
{ {
"keys": "boomBtn.png,comCloseBtn.png,comm_light.png,e305be55-fdfd-453b-9e6d-41edfe68c0f1.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,ele9的副本.png,hammerBtn.png,panelBgS.png,powerIcon.png,powerImg.png,stepBtn.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,target0.png,target1.png,target2.png,target3.png,target4.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,确定.png,继续闯关大.png,继续闯关小.png", "keys": "boomBtn.png,comCloseBtn.png,comm_light.png,e305be55-fdfd-453b-9e6d-41edfe68c0f1.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,panelBgS.png,powerIcon.png,powerImg.png,stepBtn.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,target0.png,target1.png,target2.png,target3.png,target4.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common" "name": "common"
}, },
{ {
......
src/scene/PlayScene.ts
View file @ e7a70b48
...@@ -2702,7 +2702,7 @@ export class PlayScene extends Scene { ...@@ -2702,7 +2702,7 @@ export class PlayScene extends Scene {
lat.ice = null; lat.ice = null;
this.goElementTarget(ElementType.ICE, [ice.x, ice.y]); this.goElementTarget(ElementType.ICE, [ice.x, ice.y]);
} else { } else {
ice.alpha = 0.6; ice.alpha = 0.75;
} }
var p = Tool.getPositionByIndex(lat.index); var p = Tool.getPositionByIndex(lat.index);
//动画 //动画
......
src/something/anisCall/DoorChangeAni.ts
View file @ e7a70b48
...@@ -99,7 +99,7 @@ export class DoorChangeAni extends FYGE.Container { ...@@ -99,7 +99,7 @@ export class DoorChangeAni extends FYGE.Container {
this.ice.y = -textureIce.height / 2; this.ice.y = -textureIce.height / 2;
this.addChildAt(this.ice, 2); this.addChildAt(this.ice, 2);
} }
this.ice.alpha = ice.countNum == 2 ? 1 : 0.6 this.ice.alpha = ice.countNum == 2 ? 1 : 0.75
} }
//ice没有，原先有去掉 //ice没有，原先有去掉
else if (this.ice) { else if (this.ice) {
......
src/something/class/Ice.ts
View file @ e7a70b48
...@@ -14,7 +14,7 @@ export class Ice extends FYGE.Sprite { ...@@ -14,7 +14,7 @@ export class Ice extends FYGE.Sprite {
if (value == 2) { if (value == 2) {
this.alpha = 1; this.alpha = 1;
} else { } else {
this.alpha = 0.6; this.alpha = 0.75;
} }
} }
...@@ -28,7 +28,7 @@ export class Ice extends FYGE.Sprite { ...@@ -28,7 +28,7 @@ export class Ice extends FYGE.Sprite {
if (n == 2) { if (n == 2) {
this.alpha = 1; this.alpha = 1;
} else { } else {
this.alpha = 0.6; this.alpha = 0.75;
} }
this._countNum = n; this._countNum = n;
} }
...@@ -39,7 +39,7 @@ export class Ice extends FYGE.Sprite { ...@@ -39,7 +39,7 @@ export class Ice extends FYGE.Sprite {
if (n == 2) { if (n == 2) {
this.alpha = 1; this.alpha = 1;
} else { } else {
this.alpha = 0.6; this.alpha = 0.75;
} }
this._countNum = n; this._countNum = n;
} }
......
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