Skip to content

X
xiaoxiaoleTuia
Commit 5682692d authored by wjf's avatar wjf
Browse files
Options

l

parent 0cb7766d
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 18 deletions
egret/index.html
View file @ 5682692d
......@@ -44,6 +44,7 @@
top: 0;
background: rgba(0, 0, 0, 0.6);
}
.app-close {
position: absolute;
width: 5vw;
......@@ -51,6 +52,7 @@
top: 5vw;
right: 5vw;
}
.app-info-wrap {
padding: 3vh 0;
box-sizing: border-box;
......@@ -67,6 +69,7 @@
flex-direction: column;
align-items: center;
}
.app-logo {
width: 18.7vw;
margin-top: 4vh;
......@@ -74,6 +77,7 @@
background-repeat: no-repeat;
background-size: 100%;
}
.app-name {
font-size: 24px;
font-weight: 400;
......@@ -82,6 +86,7 @@
text-align: center;
margin-top: 3vh;
}
.app-button {
width: 75.2vw;
height: 6.9vh;
......@@ -121,6 +126,20 @@
<img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;" />
<script>
window['imgver'] = '11112';//签到itemId对应图片，线上注意对应修改
window['duiba'] = '';
window["appKeyTuia"] = "2ZjLbhEBCFAzBbihEtxLEq25mXKw";//推啊appkey
//推啊广告id
window["slotIdsTuia"] = [
"324689",//首页悬浮 0
"327165",//签到完成翻倍 1
"327166",//开始前领取道具 2
"327166",//游戏中领取道具 3
"327167",//游戏失败领取步数 4
"327165",//游戏成功翻倍领取 5
"327165",//开宝箱翻倍领取 6
]
window['signconfigs'] = [
{ nums: '*20', type: 'money' },
{ nums: '*20', type: 'money' },
......
egret/libs/new_wx/components/PrizePanel.ts
View file @ 5682692d
......@@ -93,7 +93,8 @@ export default class PrizePanel extends Panel {
25
)
},
() => { showToast("广告未成功观看，无法加倍领取"); }
() => { showToast("广告未成功观看，无法加倍领取"); },
window["slotIdsTuia"][5]
)
}, this)
}
......
egret/libs/tw/manager/NetManager.ts
View file @ 5682692d
......@@ -100,7 +100,7 @@ export class NetManager extends ABNetManager {
* @param closeFn 未完成关闭
* @param comCloseFn 已完成活动，返回的提示，一般是toast或游戏内的逻辑，暂不用
*/
public getTuiaAd(rewardFn: Function, closeFn: Function/*, comCloseFn?*/) {
public getTuiaAd(rewardFn: Function, closeFn: Function, slotId: string) {
this['tuiaRewardMark'] = false;
let _rewardFn = () => {
// rewardFn();
......@@ -117,7 +117,7 @@ export class NetManager extends ABNetManager {
}
window["TAIsdk"].init({
appKey: window["appKeyTuia"] || '2ZjLbhEBCFAzBbihEtxLEq25mXKw',//固定，到时修改
slotId: window["slotIdTuia"] || '324689', //到时修改
slotId: slotId, //到时修改
deviceId: getUrl('deviceId'),
userId: window["CFG"].uid,
rewardCallback: _rewardFn,
......
egret/pro.html
View file @ 5682692d
......@@ -18,7 +18,18 @@
//window['tryWuhanVideo']=true;
window["slotidIcon"] = "srlKMxcd2230";//首页icon的广告位id
window["slotid"] = "srlboItw2231";//其他位置广告位id
window["slotIdTuia"] = "324689";//推啊广告id
window["appKeyTuia"] = "2ZjLbhEBCFAzBbihEtxLEq25mXKw";//推啊appkey
//推啊广告id
window["slotIdsTuia"] = [
"324689",//首页悬浮 0
"327165",//签到完成翻倍 1
"327166",//开始前领取道具 2
"327166",//游戏中领取道具 3
"327167",//游戏失败领取步数 4
"327165",//游戏成功翻倍领取 5
"327165",//开宝箱翻倍领取 6
]
</script>
<div style="margin: auto;width: 100%;height: 100%;" class="egret-player" data-entry-class="Main" data-orientation="auto"
......@@ -58,6 +69,7 @@
top: 0;
background: rgba(0, 0, 0, 0.6);
}
.app-close {
position: absolute;
width: 5vw;
......@@ -65,6 +77,7 @@
top: 5vw;
right: 5vw;
}
.app-info-wrap {
padding: 3vh 0;
box-sizing: border-box;
......@@ -81,6 +94,7 @@
flex-direction: column;
align-items: center;
}
.app-logo {
width: 18.7vw;
margin-top: 4vh;
......@@ -88,6 +102,7 @@
background-repeat: no-repeat;
background-size: 100%;
}
.app-name {
font-size: 24px;
font-weight: 400;
......@@ -96,6 +111,7 @@
text-align: center;
margin-top: 3vh;
}
.app-button {
width: 75.2vw;
height: 6.9vh;
......
egret/src/mainScene/MainScene.ts
View file @ 5682692d
......@@ -646,7 +646,7 @@ export default class MainScene extends Scene {
break;
//石头
case 2:
ele = Tool.getElement(ElementType.ROCK)
ele = Tool.getElement(ElementType.ROCK)
break;
//果冻
case 5:
......@@ -679,12 +679,12 @@ export default class MainScene extends Scene {
Tool.removeEle(i, this.emptys);
}
}
//针对如果地图没有棒棒糖0，但是通关目标有，需要标记生成
if (this.passElements &&
this.passElements[ElementType.LOLLIPOP] &&
!this.lollipopCount) {
this.lollipopMark = true
}
}
//针对如果地图没有棒棒糖0，但是通关目标有，需要标记生成
if (this.passElements &&
this.passElements[ElementType.LOLLIPOP] &&
!this.lollipopCount) {
this.lollipopMark = true
}
}
//重置基础元素及特效类型
......
egret/src/mapScene/MapScene.ts
View file @ 5682692d
......@@ -84,7 +84,8 @@ export default class MapScene extends Scene {
},
() => {
showToast("活动未完成，无法领取奖励");
}
},
window["slotIdsTuia"][0]
)
}, this)
......
egret/src/panels/BoxPanel.ts
View file @ 5682692d
......@@ -62,6 +62,7 @@ export default class BoxPanel extends Panel {
)
},
() => { showToast("广告未成功观看，无法加倍领取"); },
window["slotIdsTuia"][6]
)
}, this)
......
egret/src/panels/FailedPanel.ts
View file @ 5682692d
......@@ -37,7 +37,8 @@ export default class FailedPanel extends Panel {
this.hidePanel();
data.complete();
},
() => { showToast("广告未成功观看，无法复活"); }
() => { showToast("广告未成功观看，无法复活"); },
window["slotIdsTuia"][4]
)
}, this);
}
......
egret/src/panels/SignPrizePanel.ts
View file @ 5682692d
......@@ -72,7 +72,8 @@ export default class SignPrizePanel extends Panel {
21
)
},
() => { showToast("广告未成功观看，无法加倍领取") }
() => { showToast("广告未成功观看，无法加倍领取") },
window["slotIdsTuia"][1]
)
}, this)
}
......
egret/src/panels/StartPanel.ts
View file @ 5682692d
......@@ -201,6 +201,7 @@ export default class StartPanel extends Panel {
showToast("增加一个锤子道具")
},
() => { showToast("广告未成功观看，道具领取失败") },
window["slotIdsTuia"][2]
)
}
//炸弹
......@@ -214,7 +215,8 @@ export default class StartPanel extends Panel {
this['nums2Txt'].text = (this.boom + this.videoProp[0]) + "";
showToast("增加一个炸弹道具")
},
() => { showToast("广告未成功观看，道具领取失败") }
() => { showToast("广告未成功观看，道具领取失败") },
window["slotIdsTuia"][2]
)
}
//步数
......@@ -228,7 +230,8 @@ export default class StartPanel extends Panel {
this['nums3Txt'].text = (this.boom + this.videoProp[2]) + "";
showToast("增加一个增加步数道具")
},
() => { showToast("广告未成功观看，道具领取失败") }
() => { showToast("广告未成功观看，道具领取失败") },
window["slotIdsTuia"][2]
)
}
......
egret/src/panels/VideoBuyPanel.ts
View file @ 5682692d
......@@ -67,7 +67,8 @@ export default class VideoBuyPanel extends Panel {
data.complete(true);
showToast("领取成功")
},
() => { showToast("广告未成功观看，道具领取失败") }
() => { showToast("广告未成功观看，道具领取失败") },
window["slotIdsTuia"][3]
)
}, this);
} else {
......
egret/src/something/chapters/Chapter1.ts
View file @ 5682692d
......@@ -689,7 +689,7 @@ export const Chapters1: ChapterData[] = [
],
},
},
//12
//12 会开局消除，baseElements有问题
{
baseElementTypes: [0, 1, 2, 3, 4],
bubbleProbability: 0,
......
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