Skip to content

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

m

parent 04992632
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 64 deletions
.idea/workspace.xml
View file @ f3480837
......@@ -2,11 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0d3cb18d-e144-41a0-bc8b-4877c2e1fef1" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/resource/SuccessPanel/star_dis.png" 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/loadingScene/loadingBg.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/resource/loadingScene/loadingBg.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ResJson.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/ResJson.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/panels/SuccessNoPrizePanel.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -115,9 +113,9 @@
<recent_temporary>
<list>
<item itemvalue="npm.build" />
<item itemvalue="npm.buildTS" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.flushRes" />
<item itemvalue="npm.dev" />
<item itemvalue="npm.buildTS" />
</list>
</recent_temporary>
</component>
......@@ -137,13 +135,9 @@
<workItem from="1613958457445" duration="19850000" />
<workItem from="1614131869846" duration="4880000" />
<workItem from="1614219160308" duration="168000" />
</task>
<task id="LOCAL-00009" summary="20210206">
<created>1612608155005</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1612608155005</updated>
<workItem from="1614221954923" duration="158000" />
<workItem from="1614222264040" duration="190000" />
<workItem from="1614233975998" duration="374000" />
</task>
<task id="LOCAL-00010" summary="20210206">
<created>1612669957818</created>
......@@ -481,7 +475,14 @@
<option name="project" value="LOCAL" />
<updated>1614139182774</updated>
</task>
<option name="localTasksCounter" value="58" />
<task id="LOCAL-00058" summary="m">
<created>1614222109443</created>
<option name="number" value="00058" />
<option name="presentableId" value="LOCAL-00058" />
<option name="project" value="LOCAL" />
<updated>1614222109444</updated>
</task>
<option name="localTasksCounter" value="59" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......
output.js
View file @ f3480837
......@@ -2258,23 +2258,34 @@ exports.ResJson = {
}
},
{
"keys": "star_en.png,sucAgain.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucGoPrize.png,sucPrizeTip.png,sucPropTip.png,successBgL.png,successBgS.png",
"keys": "star_dis.png,star_en.png,sucAgain.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucGoPrize.png,sucPrizeTip.png,sucPropTip.png,successBgL.png,successBgS.png",
"name": "SuccessPanel",
"atlas": {
"star_dis.png": {
"x": 1897,
"y": 398,
"w": 124,
"h": 118,
"ox": 6,
"oy": 0,
"sw": 138,
"sh": 126,
"ro": false
},
"star_en.png": {
"x": 1083,
"y": 812,
"x": 1897,
"y": 258,
"w": 138,
"h": 126,
"ox": 0,
"oy": 0,
"sw": 138,
"sh": 126,
"ro": false
"ro": true
},
"sucAgain.png": {
"x": 983,
"y": 702,
"x": 1797,
"y": 258,
"w": 268,
"h": 98,
"ox": 0,
......@@ -2284,8 +2295,8 @@ exports.ResJson = {
"ro": true
},
"sucContinueL.png": {
"x": 599,
"y": 830,
"x": 1597,
"y": 130,
"w": 382,
"h": 126,
"ox": 0,
......@@ -2295,8 +2306,8 @@ exports.ResJson = {
"ro": false
},
"sucContinueS.png": {
"x": 1196,
"y": 542,
"x": 1697,
"y": 258,
"w": 268,
"h": 98,
"ox": 0,
......@@ -2306,19 +2317,19 @@ exports.ResJson = {
"ro": true
},
"sucContinueSR.png": {
"x": 1196,
"y": 272,
"x": 1597,
"y": 528,
"w": 268,
"h": 98,
"ox": 0,
"oy": 0,
"sw": 268,
"sh": 98,
"ro": true
"ro": false
},
"sucGet.png": {
"x": 1196,
"y": 2,
"x": 1597,
"y": 258,
"w": 268,
"h": 98,
"ox": 0,
......@@ -2328,8 +2339,8 @@ exports.ResJson = {
"ro": true
},
"sucGoPrize.png": {
"x": 599,
"y": 702,
"x": 1597,
"y": 2,
"w": 382,
"h": 126,
"ox": 0,
......@@ -2339,8 +2350,8 @@ exports.ResJson = {
"ro": false
},
"sucPrizeTip.png": {
"x": 2,
"y": 944,
"x": 465,
"y": 599,
"w": 461,
"h": 45,
"ox": 0,
......@@ -2351,7 +2362,7 @@ exports.ResJson = {
},
"sucPropTip.png": {
"x": 2,
"y": 897,
"y": 599,
"w": 461,
"h": 45,
"ox": 0,
......@@ -2369,10 +2380,10 @@ exports.ResJson = {
"oy": 0,
"sw": 595,
"sh": 893,
"ro": false
"ro": true
},
"successBgS.png": {
"x": 599,
"x": 897,
"y": 2,
"w": 595,
"h": 698,
......@@ -2380,7 +2391,7 @@ exports.ResJson = {
"oy": 0,
"sw": 595,
"sh": 698,
"ro": false
"ro": true
}
}
},
......@@ -7694,7 +7705,7 @@ exports.ResJson = {
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1614219232/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1614234496/resource/"
};
......@@ -12319,9 +12330,20 @@ var SuccessStarGroup = (function (_super) {
__extends(SuccessStarGroup, _super);
function SuccessStarGroup() {
var _this = _super.call(this) || this;
_this.leftStarDis = null;
_this.midStarDis = null;
_this.rightStarDis = null;
_this.leftStarEn = null;
_this.midStarEn = null;
_this.rightStarEn = null;
_this.leftStarDis = _this.addChild(Tools_1.Tools.getSprite('star_dis.png'));
_this.midStarDis = _this.addChild(Tools_1.Tools.getSprite('star_dis.png'));
_this.rightStarDis = _this.addChild(Tools_1.Tools.getSprite('star_dis.png'));
_this.leftStarDis.anchorTexture.set(0.5, 0.5);
_this.midStarDis.anchorTexture.set(0.5, 0.5);
_this.rightStarDis.anchorTexture.set(0.5, 0.5);
_this.leftStarDis.position.set(-140, 10);
_this.rightStarDis.position.set(140, 10);
_this.leftStarEn = _this.addChild(Tools_1.Tools.getSprite('star_en.png'));
_this.midStarEn = _this.addChild(Tools_1.Tools.getSprite('star_en.png'));
_this.rightStarEn = _this.addChild(Tools_1.Tools.getSprite('star_en.png'));
output.js.map
View file @ f3480837
This source diff could not be displayed because it is too large. You can view the blob instead.
resource/res.json
View file @ f3480837
......@@ -37,7 +37,7 @@
"name": "StartPanel"
},
{
"keys": "star_en.png,sucAgain.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucGoPrize.png,sucPrizeTip.png,sucPropTip.png,successBgL.png,successBgS.png",
"keys": "star_dis.png,star_en.png,sucAgain.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucGoPrize.png,sucPrizeTip.png,sucPropTip.png,successBgL.png,successBgS.png",
"name": "SuccessPanel"
},
{
......
src/ResJson.ts
View file @ f3480837
......@@ -385,23 +385,34 @@ export const ResJson = {
}
},
{
"keys": "star_en.png,sucAgain.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucGoPrize.png,sucPrizeTip.png,sucPropTip.png,successBgL.png,successBgS.png",
"keys": "star_dis.png,star_en.png,sucAgain.png,sucContinueL.png,sucContinueS.png,sucContinueSR.png,sucGet.png,sucGoPrize.png,sucPrizeTip.png,sucPropTip.png,successBgL.png,successBgS.png",
"name": "SuccessPanel",
"atlas": {
"star_dis.png": {
"x": 1897,
"y": 398,
"w": 124,
"h": 118,
"ox": 6,
"oy": 0,
"sw": 138,
"sh": 126,
"ro": false
},
"star_en.png": {
"x": 1083,
"y": 812,
"x": 1897,
"y": 258,
"w": 138,
"h": 126,
"ox": 0,
"oy": 0,
"sw": 138,
"sh": 126,
"ro": false
"ro": true
},
"sucAgain.png": {
"x": 983,
"y": 702,
"x": 1797,
"y": 258,
"w": 268,
"h": 98,
"ox": 0,
......@@ -411,8 +422,8 @@ export const ResJson = {
"ro": true
},
"sucContinueL.png": {
"x": 599,
"y": 830,
"x": 1597,
"y": 130,
"w": 382,
"h": 126,
"ox": 0,
......@@ -422,8 +433,8 @@ export const ResJson = {
"ro": false
},
"sucContinueS.png": {
"x": 1196,
"y": 542,
"x": 1697,
"y": 258,
"w": 268,
"h": 98,
"ox": 0,
......@@ -433,19 +444,19 @@ export const ResJson = {
"ro": true
},
"sucContinueSR.png": {
"x": 1196,
"y": 272,
"x": 1597,
"y": 528,
"w": 268,
"h": 98,
"ox": 0,
"oy": 0,
"sw": 268,
"sh": 98,
"ro": true
"ro": false
},
"sucGet.png": {
"x": 1196,
"y": 2,
"x": 1597,
"y": 258,
"w": 268,
"h": 98,
"ox": 0,
......@@ -455,8 +466,8 @@ export const ResJson = {
"ro": true
},
"sucGoPrize.png": {
"x": 599,
"y": 702,
"x": 1597,
"y": 2,
"w": 382,
"h": 126,
"ox": 0,
......@@ -466,8 +477,8 @@ export const ResJson = {
"ro": false
},
"sucPrizeTip.png": {
"x": 2,
"y": 944,
"x": 465,
"y": 599,
"w": 461,
"h": 45,
"ox": 0,
......@@ -478,7 +489,7 @@ export const ResJson = {
},
"sucPropTip.png": {
"x": 2,
"y": 897,
"y": 599,
"w": 461,
"h": 45,
"ox": 0,
......@@ -496,10 +507,10 @@ export const ResJson = {
"oy": 0,
"sw": 595,
"sh": 893,
"ro": false
"ro": true
},
"successBgS.png": {
"x": 599,
"x": 897,
"y": 2,
"w": 595,
"h": 698,
......@@ -507,7 +518,7 @@ export const ResJson = {
"oy": 0,
"sw": 595,
"sh": 698,
"ro": false
"ro": true
}
}
},
......@@ -5821,5 +5832,5 @@ export const ResJson = {
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1614219232/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/feile_xiaoxiao/1614234496/resource/"
}
\ No newline at end of file
src/panels/SuccessNoPrizePanel.ts
View file @ f3480837
......@@ -108,6 +108,10 @@ export class SuccessNoPrizePanel extends Panel {
export class SuccessStarGroup extends Container {
private leftStarDis: Sprite = null;
private midStarDis: Sprite = null;
private rightStarDis: Sprite = null;
private leftStarEn: Sprite = null;
private midStarEn: Sprite = null;
private rightStarEn: Sprite = null;
......@@ -115,6 +119,17 @@ export class SuccessStarGroup extends Container {
constructor() {
super();
this.leftStarDis = this.addChild(Tools.getSprite('star_dis.png'));
this.midStarDis = this.addChild(Tools.getSprite('star_dis.png'));
this.rightStarDis = this.addChild(Tools.getSprite('star_dis.png'));
this.leftStarDis.anchorTexture.set(0.5, 0.5);
this.midStarDis.anchorTexture.set(0.5, 0.5);
this.rightStarDis.anchorTexture.set(0.5, 0.5);
this.leftStarDis.position.set(-140, 10);
this.rightStarDis.position.set(140, 10);
this.leftStarEn = this.addChild(Tools.getSprite('star_en.png'));
this.midStarEn = this.addChild(Tools.getSprite('star_en.png'));
this.rightStarEn = this.addChild(Tools.getSprite('star_en.png'));
......
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