Skip to content

N
new_taobao
Commit 129cd2c8 authored by Edwise's avatar Edwise 🍷
Browse files
Options

Merge remote-tracking branch 'refs/remotes/origin/jiaoneiqunuan' into jiaoneiqunuan

parents b83bc7b0 fc981ab9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 22778 additions and 13 deletions
taobao_jn/client/app.json
View file @ 129cd2c8
{ {
"pages": [ "pages": [
"pages/pagegamemain/pagegamemain",
"pages/pagepageindex/pagepageindex", "pages/pagepageindex/pagepageindex",
"pages/pagepagerank/pagepagerank", "pages/pagepagerank/pagepagerank",
"pages/tbccDemo/tbccDemo", "pages/tbccDemo/tbccDemo",
......
taobao_jn/client/debug.log 0 → 100644
View file @ 129cd2c8
This diff is collapsed.
taobao_jn/client/pages/pagegamemain/pagegamemain.acss 0 → 100644
View file @ 129cd2c8
This diff is collapsed.
taobao_jn/client/pages/pagegamemain/pagegamemain.axml 0 → 100644
View file @ 129cd2c8
<view class="gamemain">
<image class="gamembg" src={{resList['8bcca487-d698-4e01-93e1-8e78ae10107d'].url}} />
<view class="gamemcont">
<view class="gamemdaojishi">
<image class="gamemdjsbg" src={{resList['6a67309c-0c54-47e3-8955-9756ed4e8c21'].url}} />
<label class="gamemdjslab">默认文字...</label>
</view>
<image class="gamembox" src={{resList['e281e8aa-07cc-42a7-99a9-6fc0d8c18ab1'].url}} />
<view class="gamemrolesgro">
<view class="gamemrole1">
<image class="gamemroleimg1" src={{resList['70ad9e81-ebe3-43ab-ad49-38f3c4d675bd'].url}} />
<view class="gamemplayer1">
<image class="gamempimg1" src={{resList['c68097a5-eb32-422f-8583-600e3d636c93'].url}} />
<label class="gamemptxt1">默认文字...</label>
</view>
<label class="gamemaitor1">当前温度值：0</label>
</view>
<view class="gamemrole2">
<image class="gamemroleimg2" src={{resList['70ad9e81-ebe3-43ab-ad49-38f3c4d675bd'].url}} />
<view class="gamemplayer2">
<image class="gamempimg2" src={{resList['c68097a5-eb32-422f-8583-600e3d636c93'].url}} />
<label class="gamemptxt2">默认文字...</label>
</view>
<label class="gamemaitor2">当前温度值：0</label>
</view>
<view class="gamemrole3">
<image class="gamemroleimg3" src={{resList['70ad9e81-ebe3-43ab-ad49-38f3c4d675bd'].url}} />
<view class="gamemplayer3">
<image class="gamempimg3" src={{resList['c68097a5-eb32-422f-8583-600e3d636c93'].url}} />
<label class="gamemptxt3">默认文字...</label>
</view>
<label class="gamemaitor3">当前温度值：0</label>
</view>
<view class="gamemrole4">
<image class="gamemroleimg4" src={{resList['70ad9e81-ebe3-43ab-ad49-38f3c4d675bd'].url}} />
<view class="gamemplayer4">
<image class="gamempimg4" src={{resList['c68097a5-eb32-422f-8583-600e3d636c93'].url}} />
<label class="gamemptxt4">默认文字...</label>
</view>
<label class="gamemaitor4">当前温度值：0</label>
</view>
</view>
</view>
<view class="gamembot">
<image class="gamembotimg" src={{resList['f3909518-193e-49eb-a1cd-357c4f83d796'].url}} />
<view class="gamemtool">
<image class="gamemtoobg1" src={{resList['6f5cdb3c-0c5b-42a0-9472-982761684dc4'].url}} />
<image class="gamemtoobg2" src={{resList['9d6f3caf-a088-4f6d-9e0b-87967a79656c'].url}} />
<image class="gamemtoolimg" src={{resList['e31f093d-6f42-4818-99cd-dfd3de98ef08'].url}} />
</view>
<view class="gamemsharegro">
<image class="gamemhrole" src={{resList['7b03a2af-445c-4ce6-b57b-a900e1eedfed'].url}} />
<image class="gamenrole" src={{resList['b33526ac-42e8-4f93-b8e8-dc5d44dce6aa'].url}} />
<image class="gamemsharebtn" src={{resList['8c1a94d3-8181-41f4-9d47-1eb0c7719f3d'].url}} />
</view>
<view class="gamemtask">
<image class="gamemtask1" src={{resList['578cb214-b8d4-4d91-b57a-9477ec61933e'].url}} />
<image class="gamemtask2" src={{resList['d9ce0594-e262-4e9a-adfc-0b5b2a16d9c5'].url}} />
</view>
<view class="gameminfo">
<image class="gameminfobg" src={{resList['f1611c59-e6ba-4e4d-8aeb-50d3c794e98b'].url}} />
<label class="gameminfotxt">默认文字...</label>
</view>
</view>
<view class="gamemguide" a:if="{{isnew>0&&isnew<7}}" onTap="tonextguide">
<view class="gamemguidecont" a:if="{{isnew==1||isnew==2||isnew==6}}">
<image class="gamemguide1" a:if="{{isnew==1}}" src={{resList['7474511a-a5fb-461c-944b-179fd4326cbc'].url}} />
<image class="gamemguide2" a:if="{{isnew==2}}" src={{resList['5ef54541-b2a1-43d5-8dc1-1ff20b783a52'].url}} />
<image class="gamemguide6" a:if="{{isnew==6}}" src={{resList['233958f5-8634-4f44-9639-79c04f74638a'].url}} />
</view>
<view class="gamemguidebot" a:if="{{isnew==3||isnew==4||isnew==5}}">
<image class="gamemguide3" a:if="{{isnew==3}}" src={{resList['7e075ada-3bc1-4890-aa53-f0b3eb11c0bd'].url}} />
<image class="gamemguide4" a:if="{{isnew==4}}" src={{resList['fd40efdd-8da6-4e1f-be5e-f920c917593e'].url}} />
<image class="gamemguide5" a:if="{{isnew==5}}" src={{resList['c1ac904b-6aa0-436b-8195-84b528a70446'].url}} />
</view>
</view>
<view class="gamempipei" a:if="{{show_v==1}}">
<image class="gamemppbg" src={{resList['20dd2749-7498-4c9a-989b-1c53a038419d'].url}} />
<label class="gamempptxt">正在努力寻找玩家，请稍后</label>
<view class="gamemppload">
<image class="gamemppimg1" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
<image class="gamemppimg2" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
<image class="gamemppimg3" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
<image class="gamemppimg4" src={{resList['e1e081d9-bda3-4cba-bef3-85bebd352ee2'].url}} />
</view>
</view>
</view>
\ No newline at end of file
taobao_jn/client/pages/pagegamemain/pagegamemain.js 0 → 100644
View file @ 129cd2c8
'use strict';
import resList from '../../resconfig/resList'; //import API from '../../api';
Page({
data: {
show_v:1,//1匹配，2活动
isnew:0,//新手进程，0完成，其他阶段
invitedata:[],//邀请人
gametime:3000,//活动倒计时，s
rolesnum:3,//房间人数
mywend:0,//我的温度
tooltime:1000,//升温工具倒计时
},
onLoad(props) {
this.setData({
resList: resList
});
this.changePashow();
},
//匹配3s，切换活动
changePashow(){
this.setData({
show_v:1
})
setTimeout(()=>{
this.setData({
show_v:2
})
},1000);
},
//新手下一步
tonextguide(){
let nguide = this.data.isnew+1;
this.setData({
isnew:nguide
});
},
});
\ No newline at end of file
taobao_jn/client/pages/pagegamemain/pagegamemain.json 0 → 100644
View file @ 129cd2c8
{
"usingComponents": {}
}
\ No newline at end of file
taobao_jn/client/resconfig/resList.js
View file @ 129cd2c8
...@@ -316,18 +316,144 @@ const resList = { ...@@ -316,18 +316,144 @@ const resList = {
ext: '.png', ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/mainBG.c7698e5dba4494258624138e18429842bb37e85f.png', url: '//yun.duiba.com.cn/spark/assets/mainBG.c7698e5dba4494258624138e18429842bb37e85f.png',
uuid: '3ee62d6c-3e44-470b-b2a5-fb805ec6a6c3' uuid: '3ee62d6c-3e44-470b-b2a5-fb805ec6a6c3'
}, },
'204c7b21-29a1-4b39-92a7-fdb8605f922f': { 'f3909518-193e-49eb-a1cd-357c4f83d796': {
name: 'lockBattle5', name: 'gamea1botbg',
ext: '.png', ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/lockBattle5.dec249a99705ef9512686b30fbd5d3f34a4ee3ab.png', url: '//yun.duiba.com.cn/spark/assets/gamea1botbg.ed089fb5a853e12d1e24b7e83267a844caff50e1.png',
uuid: '204c7b21-29a1-4b39-92a7-fdb8605f922f' uuid: 'f3909518-193e-49eb-a1cd-357c4f83d796',
}, },
'edc11c83-81db-4bb6-9ebd-0a276ff36fa0': { '6a67309c-0c54-47e3-8955-9756ed4e8c21': {
name: 'lockBattle7', name: 'gamea1daojishi',
ext: '.png', ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/lockBattle7.8f125a5cfd6e2258e7424df340c7b6eaf0a2bbf1.png', url: '//yun.duiba.com.cn/spark/assets/gamea1daojishi.431c9d45224b16f0920812188c420efe00469be2.png',
uuid: 'edc11c83-81db-4bb6-9ebd-0a276ff36fa0' uuid: '6a67309c-0c54-47e3-8955-9756ed4e8c21',
} },
'c68097a5-eb32-422f-8583-600e3d636c93': {
name: 'gamea1gamebg',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamea1myteamkuang.7993e85f7e04fe89ffcdf19910f401871f6605ce.png',
uuid: 'c68097a5-eb32-422f-8583-600e3d636c93',
},
'8bcca487-d698-4e01-93e1-8e78ae10107d': {
name: 'gamea1kuang1',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamea1gamebg.094cf3722373aa6d502bb67ec2b5e5453b1b635f.png',
uuid: '8bcca487-d698-4e01-93e1-8e78ae10107d',
},
'f1611c59-e6ba-4e4d-8aeb-50d3c794e98b': {
name: 'gamea1myteamkuang',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamea1kuang1.66ea5f62b0bc13e37b97992400df98004b67b1c5.png',
uuid: 'f1611c59-e6ba-4e4d-8aeb-50d3c794e98b',
},
'7b03a2af-445c-4ce6-b57b-a900e1eedfed': {
name: 'gamea1roleimg1',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamea1roleimg1.4a4bbfa099cfb5ee807e044b4a49b91b0bde8625.png',
uuid: '7b03a2af-445c-4ce6-b57b-a900e1eedfed',
},
'8c1a94d3-8181-41f4-9d47-1eb0c7719f3d': {
name: 'gamea1sharebtn',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamea1sharebtn.ac75055a53af43eb701ed049360b801eaa354525.png',
uuid: '8c1a94d3-8181-41f4-9d47-1eb0c7719f3d',
},
'b33526ac-42e8-4f93-b8e8-dc5d44dce6aa': {
name: 'gamea1sharebtn2',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamea1sharebtn2.5e4b91ea3e868d8c0ad7835511160365e82a57cd.png',
uuid: 'b33526ac-42e8-4f93-b8e8-dc5d44dce6aa',
},
'578cb214-b8d4-4d91-b57a-9477ec61933e': {
name: 'gamea1taskbtn',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamea1taskbtn.42d1bd943a0ebf0d439dcc136a33cb9341354bf3.png',
uuid: '578cb214-b8d4-4d91-b57a-9477ec61933e',
},
'6f5cdb3c-0c5b-42a0-9472-982761684dc4': {
name: 'gamea1toobg1',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamea1toobg1.2de09b090890e833c949d3b8fe17f5192461aee7.png',
uuid: '6f5cdb3c-0c5b-42a0-9472-982761684dc4',
},
'e31f093d-6f42-4818-99cd-dfd3de98ef08': {
name: 'gamea1toobg2',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamea1toolbtn.9d934919ea17776f7789557ffaf8e3d0371510e5.png',
uuid: 'e31f093d-6f42-4818-99cd-dfd3de98ef08',
},
'9d6f3caf-a088-4f6d-9e0b-87967a79656c': {
name: 'gamea1toolbtn',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamea1toobg2.3c9daa3e9235cc058ea098836ccef428da8fc39e.png',
uuid: '9d6f3caf-a088-4f6d-9e0b-87967a79656c',
},
'e281e8aa-07cc-42a7-99a9-6fc0d8c18ab1': {
name: 'gamea1xiangzi',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamea1xiangzi.bd28d6a290a74c4f583d7a2ded1a1a7f314ab4a9.png',
uuid: 'e281e8aa-07cc-42a7-99a9-6fc0d8c18ab1',
},
'd9ce0594-e262-4e9a-adfc-0b5b2a16d9c5': {
name: 'gamea1xiaohuohua',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamea1xiaohuohua.6957b1fd6b5173de3b902155d7d2408b4f43cdbd.png',
uuid: 'd9ce0594-e262-4e9a-adfc-0b5b2a16d9c5',
},
'70ad9e81-ebe3-43ab-ad49-38f3c4d675bd': {
name: 'gamea1xuqiao',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamea1xuqiao.495ac1499e3d8982fc3e5fdf4339f108fc7bdffe.png',
uuid: '70ad9e81-ebe3-43ab-ad49-38f3c4d675bd',
},
'7474511a-a5fb-461c-944b-179fd4326cbc': {
name: '新手引导页1',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/新手引导页1.b72843566e3a336297ed81707681af7676d0ce4a.png',
uuid: '7474511a-a5fb-461c-944b-179fd4326cbc',
},
'5ef54541-b2a1-43d5-8dc1-1ff20b783a52': {
name: '新手引导页2',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/新手引导页2.4976d58897fc8bf98e7db2e2ae8b7e1beb1ce7c0.png',
uuid: '5ef54541-b2a1-43d5-8dc1-1ff20b783a52',
},
'7e075ada-3bc1-4890-aa53-f0b3eb11c0bd': {
name: '新手引导页3',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/新手引导页3.5914916fd7de9eaf741fc45c2a916ec966535b35.png',
uuid: '7e075ada-3bc1-4890-aa53-f0b3eb11c0bd',
},
'fd40efdd-8da6-4e1f-be5e-f920c917593e': {
name: '新手引导页4',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/新手引导页4.32ade2154d8ff033f5288446dbfa0ee5ba7aad0d.png',
uuid: 'fd40efdd-8da6-4e1f-be5e-f920c917593e',
},
'c1ac904b-6aa0-436b-8195-84b528a70446': {
name: '新手引导页5',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/新手引导页5.935bf4bcda11a760e2638a13ece02fe9e9bfcb62.png',
uuid: 'c1ac904b-6aa0-436b-8195-84b528a70446',
},
'233958f5-8634-4f44-9639-79c04f74638a': {
name: '新手引导页6',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/新手引导页6.ea489ad0a0dca56be72d2ea7f3888e81929fd233.png',
uuid: '233958f5-8634-4f44-9639-79c04f74638a',
},
'20dd2749-7498-4c9a-989b-1c53a038419d': {
ext: '.jpg',
url: '//yun.duiba.com.cn/spark/assets/gamembg.a4218f92bcd42121683b0c84441baaa41855c439.jpg',
uuid: '20dd2749-7498-4c9a-989b-1c53a038419d',
name: 'gamembg',
},
'e1e081d9-bda3-4cba-bef3-85bebd352ee2': {
name: 'gamembtn',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/gamembtn.08993a3117406e668fa32fe0ebe844aa29ec5868.png',
uuid: 'e1e081d9-bda3-4cba-bef3-85bebd352ee2',
}
}; };
export default resList; export default resList;
\ 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