Skip to content

N
new_taobao
Commit e406620e authored by zhangjinzhou's avatar zhangjinzhou
Browse files
Options

代码暂存

parent 5a7606fe
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 39 deletions
taobao_jn/client/pages/pagegamemain/pagegamemain.acss
View file @ e406620e
.gcanvas {
.canvas {
width:750rpx;
height:900rpx;
/* z-index: 99; */
pointer-events: none;
}
.page-game {
/* position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
min-height: 100vh; */
width:100%;
height:100%;
z-index: 99;
height:800rpx;
position: absolute;
top:0rpx;
left:0rpx;
flex: 1;
display: flex;
flex-direction: column;
pointer-events: none;
}
.gamemain {
......@@ -24,6 +41,7 @@
left: 0rpx;
top: 0rpx;
position: absolute;
z-index: 0;
transform-origin: 0rpx 0rpx 0rpx;
}
.gamemain .gamemcont {
......
taobao_jn/client/pages/pagegamemain/pagegamemain.axml
View file @ e406620e
<scroll-view class="gamemain" scroll-y={{true}} scroll-top={{86}} disable-scroll={{false}}>
<scroll-view class="gamemain" scroll-y={{true}} scroll-top={{20}} disable-scroll={{false}}>
<image class="gamembg" a:if="{{show_v!=1}}" src={{resList['8bcca487-d698-4e01-93e1-8e78ae10107d'].url}} />
<canvas disable-scroll="true" id="gcanvas" class="gcanvas" onReady="canvasOnReady">
</canvas>
<view class="gamemcont" a:if="{{show_v!=1}}">
<view class="gamemdaojishi">
<image class="gamemdjsbg" src={{resList['6a67309c-0c54-47e3-8955-9756ed4e8c21'].url}} />
<label class="gamemdjslab">游戏倒计时 {{gametimeshow}}</label>
</view>
<image class="gamembox" src={{resList['e281e8aa-07cc-42a7-99a9-6fc0d8c18ab1'].url}} />
<view class="page-game" a:if="{{show_v!=1}}">
<canvas disable-scroll="true" id="canvas" class="canvas" onReady="canvasOnReady">
</canvas>
</view>
<view class="gamemrolesgro">
<view class="gamemrole1" a:if="{{roomdata.length>0}}">
<image class="gamemroleimg1" src={{resList['70ad9e81-ebe3-43ab-ad49-38f3c4d675bd'].url}} />
<!--<image class="gamemroleimg1" src={{resList['70ad9e81-ebe3-43ab-ad49-38f3c4d675bd'].url}} /> -->
<view class="gamemplayer1" a:if="{{myidx==1}}">
<image class="gamempimg1" src={{resList['c68097a5-eb32-422f-8583-600e3d636c93'].url}} />
<label class="gamemptxt1">{{"我的队伍\n"+"当前温度值："+roomdata[myidx-1].wd+"℃"}}</label>
......@@ -18,7 +20,7 @@
<label class="gamemaitor1" a:if="{{myidx!=1}}">当前温度值：{{roomdata[0].wd}}℃</label>
</view>
<view class="gamemrole2" a:if="{{roomdata.length>1}}">
<image class="gamemroleimg2" src={{resList['70ad9e81-ebe3-43ab-ad49-38f3c4d675bd'].url}} />
<!--<image class="gamemroleimg2" src={{resList['70ad9e81-ebe3-43ab-ad49-38f3c4d675bd'].url}} /> -->
<view class="gamemplayer2" a:if="{{myidx==2}}">
<image class="gamempimg2" src={{resList['c68097a5-eb32-422f-8583-600e3d636c93'].url}} />
<label class="gamemptxt2">{{"我的队伍\n"+"当前温度值："+roomdata[myidx-1].wd+"℃"}}</label>
......@@ -26,7 +28,7 @@
<label class="gamemaitor2" a:if="{{myidx!=2}}">当前温度值：{{roomdata[1].wd}}℃</label>
</view>
<view class="gamemrole3" a:if="{{roomdata.length>2}}">
<image class="gamemroleimg3" src={{resList['70ad9e81-ebe3-43ab-ad49-38f3c4d675bd'].url}} />
<!--<image class="gamemroleimg3" src={{resList['70ad9e81-ebe3-43ab-ad49-38f3c4d675bd'].url}} /> -->
<view class="gamemplayer3" a:if="{{myidx==3}}">
<image class="gamempimg3" src={{resList['c68097a5-eb32-422f-8583-600e3d636c93'].url}} />
<label class="gamemptxt3">{{"我的队伍\n"+"当前温度值："+roomdata[myidx-1].wd+"℃"}}</label>
......@@ -34,7 +36,7 @@
<label class="gamemaitor3" a:if="{{myidx!=3}}">当前温度值：{{roomdata[2].wd}}℃</label>
</view>
<view class="gamemrole4" a:if="{{roomdata.length>3}}">
<image class="gamemroleimg4" src={{resList['70ad9e81-ebe3-43ab-ad49-38f3c4d675bd'].url}} />
<!--<image class="gamemroleimg4" src={{resList['70ad9e81-ebe3-43ab-ad49-38f3c4d675bd'].url}} /> -->
<view class="gamemplayer4" a:if="{{myidx==4}}">
<image class="gamempimg4" src={{resList['c68097a5-eb32-422f-8583-600e3d636c93'].url}} />
<label class="gamemptxt4">{{"我的队伍\n"+"当前温度值："+roomdata[myidx-1].wd+"℃"}}</label>
......@@ -94,7 +96,6 @@
<image class="gamemppimg2" style="{{roomnums==2?'left:534rpx':roomnums==3?'left:315.5rpx':'left:238rpx'}}" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
<image class="gamemppimg3" a:if="{{roomnums>2}}" style="{{roomnums==3?'left:534rpx':'left:386rpx'}}" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
<image class="gamemppimg4" a:if="{{roomnums>3}}" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
<image class="gamemppimga1" src={{avatar1}} />
<image class="gamemppimga2" src={{avatar2}} style="{{roomnums==2?'left:538rpx':roomnums==3?'left:319.5rpx':'left:242rpx'}}" />
<image class="gamemppimga3" a:if="{{roomnums>2}}" src={{avatar3}} style="{{roomnums==3?'left:538rpx':'left:390rpx'}}" />
......@@ -102,11 +103,19 @@
</view>
</view>
</scroll-view>
<view class="popcontainer" a:if="{{pkshow1_v}}"><pkprize-modal onClose="closetohome" onLockStep="openLockStep" gameOverData="{{pk1data}}"></pkprize-modal></view>
<view class="popcontainer" a:if="{{pkshow2_v}}"><pknoprize-modal onClose="closetohome" gameOverData="{{pk1data}}"></pknoprize-modal></view>
<view class="popcontainer" a:if="{{pkshow3_v}}"><pkfailnoprize-modal onClose="closetohome" gameOverData="{{pk1data}}"></pkfailnoprize-modal></view>
<view class="popcontainer" a:if="{{pkshow4_v}}"><pksuccessnoprize-modal onClose="closetohome" onLockStep="openLockStep" gameOverData="{{pk1data}}"></pksuccessnoprize-modal></view>
<view class="popcontainer" a:if="{{toolshow_v}}"><tempitem-modal onClose="usetool1"></tempitem-modal></view>
<view class="popcontainer_down" a:if="{{taskshow_v}}"><task-modal onClose="closeTask"></task-modal></view>
<view class="popcontainer" a:if="{{invite_v}}"><gameinvite-modal onClose="closeInvite" inviteData="{{inviteshowdata}}"></gameinvite-modal></view>
<view class="popcontainer" a:if="{{lockstepshow_v}}"><lockstep-modal gameOverData="{{unLockPkData}}" onClose="closetohome"></lockstep-modal></view>
<view class="popcontainer" a:if="{{pkshow1_v}}">
<pkprize-modal onClose="closetohome" onLockStep="openLockStep" gameOverData="{{pk1data}}"></pkprize-modal></view>
<view class="popcontainer" a:if="{{pkshow2_v}}">
<pknoprize-modal onClose="closetohome" gameOverData="{{pk1data}}"></pknoprize-modal></view>
<view class="popcontainer" a:if="{{pkshow3_v}}">
<pkfailnoprize-modal onClose="closetohome" gameOverData="{{pk1data}}"></pkfailnoprize-modal></view>
<view class="popcontainer" a:if="{{pkshow4_v}}">
<pksuccessnoprize-modal onClose="closetohome" onLockStep="openLockStep" gameOverData="{{pk1data}}"></pksuccessnoprize-modal></view>
<view class="popcontainer" a:if="{{toolshow_v}}">
<tempitem-modal onClose="usetool1"></tempitem-modal></view>
<view class="popcontainer_down" a:if="{{taskshow_v}}">
<task-modal onClose="closeTask"></task-modal></view>
<view class="popcontainer" a:if="{{lockstepshow_v}}">
<lockstep-modal gameOverData="{{unLockPkData}}" onClose="closetohome"></lockstep-modal></view>
<view class="popcontainer" a:if="{{invite_v}}">
<gameinvite-modal onClose="closeInvite" inviteData="{{inviteshowdata}}"></gameinvite-modal></view>
\ No newline at end of file
taobao_jn/client/pages/pagegamemain/pagegamemain.js
View file @ e406620e
......@@ -23,10 +23,11 @@ const taskwarm = 1;//任务+温度值
const invitewarm = 1;//邀请+温度值
let gtoolcd = 5;//
const paple1 = "cloud://1C47337C3D86F381913E3741232B26EB//paple1.svga";
const paple1 = "cloud://F03F0071205084B1A58F9C560010C076//paple3.svga";
const paple2 = "cloud://6E5D893BA34F99343C702D9FAA543C21//paple2.svga";
const paple3 = "cloud://F03F0071205084B1A58F9C560010C076//paple3.svga";
const paple3 = "cloud://1C47337C3D86F381913E3741232B26EB//paple1.svga";
const paple4 = "cloud://650F093A4384DAB23C0C551A7818EE1F//paple4.svga";
let paples = [];
Page({
data: {
resList: resList,
......@@ -109,7 +110,7 @@ Page({
avatar2: "",
avatar3: "",
avatar4: "",
canwin: false
canwin: false,
},
onLoad(query) {
// console.log("onLoad========>", app, props);
......@@ -117,7 +118,7 @@ Page({
key: 'jn_' + app.openId + '_new'
});
let isnew = isnewdata.data ? 0 : 1;
isnew = 1;
// isnew = 1;
this.setData({
isnew: isnew
});
......@@ -131,6 +132,7 @@ Page({
console.log("新手", isnew, query);
let { end, gl, start, step, toolcd } = query;
step = Number(step);
step = 3;
gameatime = Math.floor((Number(end) - Number(start)) / 1000);
gtoolcd = Number(toolcd);
let sucgl = Number(gl);
......@@ -173,7 +175,7 @@ Page({
my.__updateWarms = () => {
this.updateActInfo();
}
console.log("my======>",my);
// console.log("my======>",my);
},
startGame() {
if (this.data.isnew > 0 && this.data.isnew < 7) {
......@@ -397,7 +399,7 @@ Page({
},
//游戏结束
async gameover() {
this.closetool();
this.closenordia();
// console.log("游戏结束");
let roomnums = this.data.roomnums;
let mywd = this.data.roomdata[this.data.myidx - 1].wd;
......@@ -522,6 +524,11 @@ Page({
},
//升温
updateRolewd(ridx, rwd) {
let mv = paples[ridx-1]
if(mv&&rwd){
mv.gotoAndPlay(1);
}
this.data.roomdata[ridx - 1]["wd"] = rwd;
let ndata = this.data.roomdata;
this.setData({
......@@ -586,7 +593,11 @@ Page({
if (success) {
const { total, invite, tool, follow, sign, collect, browseGoods } = data;
let ridx = this.data.myidx;
this.updateRolewd(ridx, total);
let nwd = this.data.roomdata[ridx - 1]["wd"]||0;
if(total>nwd){
this.updateRolewd(ridx, total);
}
// let addattion = [];
if (invite) {
let txt1 = this.solveAttionTxt(invite, this.data.linvite, "invite");
......@@ -729,6 +740,12 @@ Page({
// my.navigateBack();
my.redirectTo({ url: '/pages/pagepageindex/pagepageindex' })
},
//关闭一般弹窗
closenordia(){
this.closetool();
this.closeTask();
this.closeInvite();
},
//打开道具页面
opentool() {
......@@ -855,19 +872,24 @@ Page({
FYGE.RENDERER_TYPE.CANVAS
);
//stage初始化
let addy = 50;
stage.addEventListener(FYGE.Event.INIT_STAGE, () => {
SvgaParser.loadSvga(
paple1,
(v) => {
console.log("svga" + v);
var mv = stage.addChild(new FYGE.MovieClip(v));
mv.x = 400;
mv.x = 383;
mv.y = 390;
console.log("svgmv", mv)
paples[0] = mv;
mv.gotoAndStop(1);
mv.addEventListener(FYGE.Event.END_FRAME,()=>{
mv.gotoAndStop(1);
})
},
(err) => {
console.log(err);
console.log("aa",err);
}
)
SvgaParser.loadSvga(
......@@ -875,10 +897,14 @@ Page({
(v) => {
console.log("svga" + v);
var mv = stage.addChild(new FYGE.MovieClip(v));
mv.x = 100;
mv.y = 450;
console.log("svgmv", mv)
mv.x = 83;
mv.y = 420;
console.log("svgmv", mv);
paples[1] = mv;
mv.gotoAndStop(1);
mv.addEventListener(FYGE.Event.END_FRAME,()=>{
mv.gotoAndStop(1);
})
},
(err) => {
console.log(err);
......@@ -889,10 +915,14 @@ Page({
(v) => {
console.log("svga" + v);
var mv = stage.addChild(new FYGE.MovieClip(v));
mv.x = 240;
mv.y = 540;
mv.x = 232;
mv.y = 510;
console.log("svgmv", mv)
paples[2] = mv;
mv.gotoAndStop(1);
mv.addEventListener(FYGE.Event.END_FRAME,()=>{
mv.gotoAndStop(1);
})
},
(err) => {
console.log(err);
......@@ -903,10 +933,14 @@ Page({
(v) => {
console.log("svga" + v);
var mv = stage.addChild(new FYGE.MovieClip(v));
mv.x = 450;
mv.y = 590;
mv.x = 420;
mv.y = 560;
console.log("svgmv", mv)
paples[3] = mv;
mv.gotoAndStop(1);
mv.addEventListener(FYGE.Event.END_FRAME,()=>{
mv.gotoAndStop(1);
})
},
(err) => {
console.log(err);
......
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