Skip to content

X
xiaoxiaole
Commit 9c5e1e09 authored by 邱旭's avatar 邱旭
Browse files
Options

1

parent 6bc60c30
Expand all Show whitespace changes
Inline Side-by-side
Showing with 200 additions and 152 deletions
egret/resource/TextureMerger/map.tmproject
View file @ 9c5e1e09
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/宝箱.png","../assets/map/宝箱1.png","../assets/map/宝箱2.png","../assets/map/宝箱3.png","../assets/map/宝箱bg.png","../assets/map/宝箱btn.png","../assets/map/道具.png","../assets/map/关闭 拷贝.png","../assets/map/光 副本 4.png","../assets/map/设置.png","../assets/map/设置bg.png","../assets/map/声音.png","../assets/map/声音关闭.png","../assets/map/狮子.png","../assets/map/退出.png","../assets/map/问题.png","../assets/map/无星星.png","../assets/map/星星.png","../assets/map/星星bg.png","../assets/map/音乐.png","../assets/map/音乐关闭.png","../assets/map/有星星.png","../assets/map/有星星2.png","../assets/map/有星星3.png","../assets/map/元宝bg.png","../assets/map/ad_icon.png","../assets/map/animal1.png","../assets/map/avatar.png","../assets/map/friend_avatar.png","../assets/map/guideBox.png","../assets/map/guideLevel.png","../assets/map/guideLove.png","../assets/map/guideMoney.png","../assets/map/guideOver.png","../assets/map/icon.png","../assets/map/iconbg.png","../assets/map/icongray.png","../assets/map/invite_icon.png","../assets/map/invite_txtbg.png","../assets/map/lionMsgBg.png","../assets/map/map_signicon.png","../assets/map/map2+.png","../assets/map/map2+bg.png","../assets/map/map2红包大作战.png","../assets/map/map2热门引导.png","../assets/map/map2周一红包雨.png","../assets/map/map大转盘.png","../assets/map/map刮现金红包.png","../assets/map/map今日可领.png","../assets/map/map明日可领.png","../assets/map/maphot.png","../assets/map/msgTri.png","../assets/map/namebg.png","../assets/map/progress1.png","../assets/map/progress2.png","../assets/map/recordbtn.png","../assets/map/taskicon.png","../assets/map/map2+bg2.png","../assets/map/mapredbagicom.png","../assets/map/maplight2.png","../assets/map/taskBtn.png","../assets/map/txtbg_blue.png","../assets/map/txtbg_orange.png","../assets/map/txtbg_purple.png"]}
\ No newline at end of file
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/宝箱.png","../assets/map/宝箱1.png","../assets/map/宝箱2.png","../assets/map/宝箱3.png","../assets/map/宝箱bg.png","../assets/map/宝箱btn.png","../assets/map/道具.png","../assets/map/关闭 拷贝.png","../assets/map/光 副本 4.png","../assets/map/设置.png","../assets/map/设置bg.png","../assets/map/声音.png","../assets/map/声音关闭.png","../assets/map/狮子.png","../assets/map/退出.png","../assets/map/问题.png","../assets/map/无星星.png","../assets/map/星星.png","../assets/map/星星bg.png","../assets/map/音乐.png","../assets/map/音乐关闭.png","../assets/map/有星星.png","../assets/map/有星星2.png","../assets/map/有星星3.png","../assets/map/元宝bg.png","../assets/map/ad_icon.png","../assets/map/animal1.png","../assets/map/avatar.png","../assets/map/friend_avatar.png","../assets/map/guideBox.png","../assets/map/guideLevel.png","../assets/map/guideLove.png","../assets/map/guideMoney.png","../assets/map/guideOver.png","../assets/map/icon.png","../assets/map/iconbg.png","../assets/map/icongray.png","../assets/map/invite_icon.png","../assets/map/invite_txtbg.png","../assets/map/lionMsgBg.png","../assets/map/map_signicon.png","../assets/map/map2+.png","../assets/map/map2+bg.png","../assets/map/map2红包大作战.png","../assets/map/map2热门引导.png","../assets/map/map2周一红包雨.png","../assets/map/map大转盘.png","../assets/map/map刮现金红包.png","../assets/map/map今日可领.png","../assets/map/map明日可领.png","../assets/map/maphot.png","../assets/map/msgTri.png","../assets/map/namebg.png","../assets/map/progress1.png","../assets/map/progress2.png","../assets/map/recordbtn.png","../assets/map/taskicon.png","../assets/map/map2+bg2.png","../assets/map/mapredbagicom.png","../assets/map/maplight2.png","../assets/map/taskBtn.png","../assets/map/txtbg_blue.png","../assets/map/txtbg_orange.png","../assets/map/txtbg_purple.png","../assets/map/mapredbagicom2.png"]}
\ No newline at end of file
egret/resource/TextureMerger/redbombalert.tmproject 0 → 100644
View file @ 9c5e1e09
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"redbombalert","version":5,"files":["../assets/redbombalert/redbombalert文案.png"]}
\ No newline at end of file
egret/resource/TextureMerger/redbombtips2.tmproject 0 → 100644
View file @ 9c5e1e09
{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"redbombtips2","version":5,"files":["../assets/redbombtips/redbagtips_ele.png","../assets/redbombtips/redbagtips_ele1.png","../assets/redbombtips/redbagtips_ele2.png","../assets/redbombtips/redbagtips_ele3.png","../assets/redbombtips/redbagtips_light.png","../assets/redbombtips/redbagtips按钮.png","../assets/redbombtips/redbagtips活动规则.png","../assets/redbombtips/redbagtipsbg.png","../assets/redbombtips/redbagtips_ele7.png"]}
\ No newline at end of file
egret/resource/default.res.json
View file @ 9c5e1e09
......@@ -223,6 +223,10 @@
{
"keys": "recharge_bg_png,recharge_btn_bg_png,recharge_num_bg_png,recharge_10_ds_png,recharge_10_en_png,recharge_1000_ds_png,recharge_1000_en_png,recharge_500_ds_png,recharge_500_en_png,recharge_add_ds_png,recharge_add_en_png,recharge_sub_ds_png,recharge_sub_en_png,recharge_1_ds_png,recharge_1_en_png,recharge_100_ds_png,recharge_100_en_png,recharge_50_ds_png,recharge_50_en_png",
"name": "recharge"
},
{
"keys": "redbombalert文案_png,redAlert_btn_png",
"name": "redbombalert"
}
],
"resources": [
......@@ -3847,6 +3851,11 @@
"url": "assets/mainScene/ele14.png",
"type": "image",
"name": "ele14_png"
},
{
"url": "assets/redbombalert/redAlert_btn.png",
"type": "image",
"name": "redAlert_btn_png"
}
]
}
\ No newline at end of file
egret/resource/skins/RedBombAlertSkin.exml
View file @ 9c5e1e09
<?xml version="1.0" encoding="utf-8"?>
<e:Skin class="RedBombAlertSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
<e:Group id="group" x="133" y="417">
<e:Group id="group" y="388.5" horizontalCenter="0">
<e:Image source="redbombalert文案_png" y="0" x="86"/>
<e:Label id="tips" text="今日还有2个红包在其他关卡等你哦~" y="79" textColor="0xffe9c0" x="0"/>
</e:Group>
<e:Group id="btn" x="196" y="1100" visible="false">
<e:Image source="redAlert_btn_png" y="0" x="0"/>
<e:Label id="btnLabel" text="愉快收下" y="30" size="38" stroke="2" strokeColor="0x2f7df9" fontFamily="FZY3JW" x="103"/>
</e:Group>
</e:Skin>
\ No newline at end of file
egret/src/mapScene/MapRpeatPart.ts
View file @ 9c5e1e09
......@@ -2,7 +2,6 @@ import ComponentBase from "../../libs/new_wx/components/ComponentBase";
import MapTopPart from "./MapTopPart";
import MapScene from "./MapScene";
import MapStarComp from "./MapStarComp";
import { createData } from "../startScene/StartScene";
import setGray from "../setGray";
import { showToast } from "../../libs/new_wx/ctrls/toastCtrl";
......@@ -47,8 +46,8 @@ export default class MapRpeatPart extends ComponentBase {
// console.log(icon['visibleY'] );
}
this['animal1'].visible = this._index % 2;
this['animal2'].visible = !this['animal1'].visible;
// this['animal1'].visible = this._index % 2;
// this['animal2'].visible = !this['animal1'].visible;
}
getIcon(i) { return this[`icon${i}`]; }
......
egret/src/panels/BombTips2Panel.ts
View file @ 9c5e1e09
......@@ -5,6 +5,8 @@ import { createEffect1MovieClip } from "../effect/createEffect1";
import RedBombRule from "./RedBombRule";
import { loadSvga } from "../loadSvga";
import getResPath from "../../libs/new_tc/getResPath";
import { NetManager } from "../../libs/tw/manager/NetManager";
import { getlogItem } from "../Main";
export default class BombTips2Panel extends Panel {
mv;
......@@ -30,6 +32,7 @@ export default class BombTips2Panel extends Panel {
}
showlog() {
NetManager.ins.showLog(getlogItem(74));
}
initEvents() {
......@@ -47,6 +50,7 @@ export default class BombTips2Panel extends Panel {
onTapInvite() {
this['btn'].touchEnabled = false;
NetManager.ins.clickLog(getlogItem(74));
const dur = 100;
egret.Tween.get(this.mv).to({alpha: 0}, dur);
egret.Tween.get(this['btn']).to({alpha: 0}, dur);
......
egret/src/panels/BombTipsPanel.ts
View file @ 9c5e1e09
......@@ -3,6 +3,8 @@ import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
import SceneCtrl from "../../libs/new_wx/ctrls/sceneCtrl";
import { createEffect1MovieClip } from "../effect/createEffect1";
import RedBombRule from "./RedBombRule";
import { NetManager } from "../../libs/tw/manager/NetManager";
import { getlogItem } from "../Main";
export default class BombTipsPanel extends Panel {
async start(data) {
......@@ -29,6 +31,7 @@ export default class BombTipsPanel extends Panel {
}
showlog() {
NetManager.ins.showLog(getlogItem(74));
}
initEvents() {
......@@ -46,6 +49,7 @@ export default class BombTipsPanel extends Panel {
onTapInvite() {
this['btn'].touchEnabled=false;
NetManager.ins.clickLog(getlogItem(74));
const eles = ['btn', 'rulebtn', 'bg', 'ele1', 'ele2', 'ele3', 'ele4', 'light'];
const dur = 100;
eles.forEach((e, index) => {
......
egret/src/panels/RechargePanel.ts
View file @ 9c5e1e09
......@@ -149,8 +149,8 @@ export default class RechargePanel extends Panel {
console.warn(error)
}
NetManager.ins.exchangeCoin((success, res) => {
this.btn.touchEnabled = true;
if(!success) {
this.btn.touchEnabled = true;
showToast('网络开小差啦，请稍后再试');
return;
}
......@@ -160,6 +160,7 @@ export default class RechargePanel extends Panel {
this.onTouchTap_closeBtn();
// PanelCtrl.instance.show('Shop');
SceneCtrl.instance.updateScene();
this.btn.touchEnabled = true;
}, window['collectRuleId']);
}, this.nowNumber);
}
......
egret/src/panels/RedBombAlertPanel.ts
View file @ 9c5e1e09
......@@ -3,19 +3,25 @@ import Panel from "../../libs/new_wx/components/Panel";
import { getRedBombTimes } from "../getRedBombAward";
import { loadSvga } from "../loadSvga";
import { DataManager } from "../../libs/tw/manager/DataManager";
import { getlogItem } from "../Main";
import { NetManager } from "../../libs/tw/manager/NetManager";
export default class RedBombAlertPanel extends Panel {
public group: eui.Group;
public tips: eui.Label;
public btn: eui.Group;
public btnLabel: eui.Label;
async start(data) {
super.start();
this.showlog();
const times = getRedBombTimes();
this['tips'].text = `今日还有${times}个红包在其他关卡等你哦~`;
if (times <= 0) {
if(times <= 0) {
this['tips'].text = `当日红包任务达成，明日再来~`;
}
this['group'].alpha = 0;
egret.Tween.get(this['group']).wait(1500).to({ alpha: 1 }, 300);
egret.Tween.get(this['group']).wait(1500).to({alpha: 1}, 300);
loadSvga(getResPath() + 'resource/assets/svgas/redbomb.svga').then(async (mv: any) => {
this.addChild(mv);
mv.once(egret.Event.COMPLETE, () => {
......@@ -23,9 +29,9 @@ export default class RedBombAlertPanel extends Panel {
this.removeChild(mv);
//条件再修改，根据后端数据
const data = DataManager.ins.getData('hc_redBombAward').data;
if(data&&data.option){
if(data && data.option) {
this.playPrizeAni();
}else{
} else {
this.playNoPrizeAni();
}
}, this);
......@@ -35,44 +41,58 @@ export default class RedBombAlertPanel extends Panel {
playNoPrizeAni() {
loadSvga(getResPath() + 'resource/assets/svgas/redbomb_noprize.svga').then(async (mv: any) => {
//去掉文案
egret.Tween.get(this['group']).to({alpha:0},300);
egret.Tween.get(this['group']).to({alpha: 0}, 300);
this.addChild(mv);
setTimeout(() => {
this.btn.visible = true;
this.btnLabel.text = '我知道了';
NetManager.ins.showLog(getlogItem(76));
this.btn.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
NetManager.ins.clickLog(getlogItem(76));
this.onTouchTap_closeBtn();
}, this);
}, 1000);
mv.once(egret.Event.COMPLETE, () => {
mv.stop();
this.once(egret.TouchEvent.TOUCH_TAP,()=>{this.hidePanel()},this);
this.once(egret.TouchEvent.TOUCH_TAP, () => {
this.hidePanel()
}, this);
}, this);
});
}
playPrizeAni(){
playPrizeAni() {
loadSvga(getResPath() + 'resource/assets/svgas/redbomb_prize.svga').then(async (mv: any) => {
//去掉文案
egret.Tween.get(this['group']).to({alpha:0},300);
egret.Tween.get(this['group']).to({alpha: 0}, 300);
this.addChild(mv);
setTimeout(() => {
this.btn.visible = true;
this.btnLabel.text = '愉快收下';
NetManager.ins.showLog(getlogItem(75));
this.btn.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
NetManager.ins.clickLog(getlogItem(75));
this.onTouchTap_closeBtn();
}, this);
}, 1000);
mv.once(egret.Event.COMPLETE, () => {
mv.stop();
this.once(egret.TouchEvent.TOUCH_TAP,()=>{this.hidePanel()},this);
this.once(egret.TouchEvent.TOUCH_TAP, () => {
this.hidePanel()
}, this);
}, this);
setTimeout(()=>{
mv.setImage("img_1951",DataManager.ins.getData('hc_redBombAward').data.option.img)
},100)
setTimeout(() => {
mv.setImage("img_1951", DataManager.ins.getData('hc_redBombAward').data.option.img)
}, 100)
});
}
showlog() {
protected get closeBtns(): eui.Button[] {
return [this['closeBtn']]
}
initEvents() {
super.initEvents();
// this['btn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this);
get skinKey() {
return 'RedBombAlert'
}
onTapInvite() {
}
protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }
get skinKey() { return 'RedBombAlert' }
}
\ No newline at end of file
egret/src/something/anisCall/FesRedShootAni2.ts
View file @ 9c5e1e09
......@@ -4,6 +4,7 @@ import { RecoverName } from "../enum/RecoverName";
import { Element } from "../class/Element";
import { Tool } from "../Tool";
import { ElementType } from "../enum/ElementType";
import { Particle } from "../../../libs/particle/Particle";
export const stepPosition: number[] = [125, 115];
......@@ -23,6 +24,7 @@ export class FesRedShootAni2 extends egret.DisplayObjectContainer {
for (var i = 1; i <= 10; i++) {
arr.push("fesEleSmallDis" + i + "_png");
}
new Particle()
this.imageAniCon = new egret.DisplayObjectContainer();
this.imageAni = new ImageAni(arr);
this.imageAniCon.addChild(this.imageAni);
......
mock/happyclear/award.json
View file @ 9c5e1e09
{
"code":"0000000000",
"data":{
"option":{
"appItemId":2322,
"categoryType":1,
"coinType":1,
"img":"//yun.dui88.com/images/201910/e6pmpk2pne.png",
"maxValue":2,
"minValue":1,
"name":"测试商品",
"num":3,
"propType":2,
"rate":"概率",
"title":"商品信息",
"value":"虚拟商品标识符"
"success": true,
"code": "0000000000",
"desc": "OK",
"timestamp": 1576659264135,
"data": {
"option": {
"id": "136",
"day": null,
"categoryType": 7,
"title": "虚拟商品",
"rate": "100",
"minValue": null,
"maxValue": null,
"coinType": null,
"realValue": null,
"propType": null,
"num": null,
"img": "//yun.dui88.com/images/201912/5fyh67cjgh.jpeg",
"appItemId": 165699,
"name": "yqq测试03-虚拟商品",
"value": "1"
},
"orderNum":"1234232546",
"remainAwardTimes":1
},
"desc":"OK",
"success":true,
"timestamp":1572923678758
"orderNum": "1173279425966400135",
"remainAwardTimes": 2
}
}
\ 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