Commit bd4dfd0d authored by zhangjinzhou's avatar zhangjinzhou

头像昵称

parent 5040cb22
......@@ -5,7 +5,7 @@ import API from '../../api';
import * as FYGE from "fyge-tbmini";
import * as SvgaParser from "svga-parser";
import {
modalType, SHARE_CONFIG
modalType, SHARE_CONFIG,gnickNames,gavatars
} from '../../tbcc-sdk/lib/constants';
const app = getApp();
const {
......@@ -112,6 +112,8 @@ Page({
avatar3: "",
avatar4: "",
canwin: false,
hidetime:0,
othername:[],
},
onLoad(query) {
// console.log("onLoad========>", app, props);
......@@ -143,13 +145,34 @@ Page({
canwin = true;
}
let roomnums = [2, 3, 4][step - 1];
if (roomnums == 2) {
} else if (roomnums == 3) {
} else if (roomnums == 4) {
let txkeys = Object.keys(gavatars);
let othername = ["你"];
for(let gu=0;gu<roomnums-1;gu++){
let guax = Math.floor(Math.random()*txkeys.length);
let guuid = txkeys.splice(guax,1)[0];
let guimg = gavatars[guuid].url;
let gunx = Math.floor(Math.random()*gnickNames.length);
let gunick = gnickNames.splice(gunx,1)[0];
if(gu==0){
this.setData({
avatar2:guimg,
})
}else if(gu==1){
this.setData({
avatar3:guimg
})
}else if(gu==2){
this.setData({
avatar4:guimg
})
}
othername.push(gunick);
}
// console.log("玩家名字",othername);
this.setData({
othername:othername
});
let roomdata = [];
for (let i = 0; i < roomnums; i++) {
let idata = {
......@@ -341,22 +364,23 @@ Page({
addOneAiWarm(data, i) {
let type = data[0];
let nums = data[1];
let othername = this.data.othername;
if (type == "tool") {
let itxt = "玩家" + (i + 1) + "使用道具一次获得了" + toolwarm + "温度值";
let itxt = othername[i]+"使用道具一次获得了" + toolwarm + "温度值";
this.addAttionTxt(itxt);
let inroomidx = i;
let inwd = this.data.roomdata[inroomidx]["wd"];
inwd += toolwarm;
this.updateRolewd(i + 1, inwd);
} else if (type == "task") {
let itxt = "玩家" + (i + 1) + "完成了" + nums + "个任务,获得了" + taskwarm * nums + "温度值";
let itxt = othername[i]+ "完成了" + nums + "个任务,获得了" + taskwarm * nums + "温度值";
this.addAttionTxt(itxt);
let inroomidx = i;
let inwd = this.data.roomdata[inroomidx]["wd"];
inwd += taskwarm * nums;
this.updateRolewd(i + 1, inwd);
} else if (type == "invite") {
let itxt = "玩家" + (i + 1) + "邀请了" + nums + "位好友,获得了" + invitewarm * nums + "温度值";
let itxt = othername[i] + "邀请了" + nums + "位好友,获得了" + invitewarm * nums + "温度值";
this.addAttionTxt(itxt);
let inroomidx = i;
let inwd = this.data.roomdata[inroomidx]["wd"];
......@@ -378,11 +402,12 @@ Page({
},
aiUseOneTool() {
let roomnums = this.data.roomnums - 1;
let othername = this.data.othername
for (let i = 0; i < roomnums; i++) {
let chatime = Math.ceil(Math.random() * 5) + 2;
let itime1 = Number((Math.random() * chatime).toFixed(2)) * 1000;
setTimeout(() => {
let itxt = "玩家" + (i + 1) + "使用道具获得了" + toolwarm + "温度值";
let itxt = othername[i] + "使用道具获得了" + toolwarm + "温度值";
this.addAttionTxt(itxt);
let inroomidx = i + 1;
let inwd = this.data.roomdata[inroomidx]["wd"];
......@@ -419,7 +444,8 @@ Page({
aiuseTool(time, i, chatime) {
setTimeout(() => {
// console.log("ai" + i + "使用道具升温度");
let itxt = "玩家" + (i + 1) + "使用道具获得了" + toolwarm + "温度值";
let othername = this.data.othername
let itxt = othername[i] + "使用道具获得了" + toolwarm + "温度值";
this.addAttionTxt(itxt);
let inroomidx = i + 1;
let inwd = this.data.roomdata[inroomidx]["wd"];
......@@ -438,14 +464,16 @@ Page({
//机器邀请人
ainvite(invitenums, i) {
let chatime = Math.floor(gameatime / invitenums) * 1000;
let othername = this.data.othername
for (let i1 = 0; i1 < invitenums; i1++) {
let i1start = i1 * chatime;
let i1end = (i1 + 1) * chatime - 5000;
let rangetime = Math.floor(Math.random() * (i1end - i1start)) + i1start;
// console.log(rangetime);
setTimeout(() => {
// console.log("ai" + i + "邀请好友升温度");
let itxt = "玩家" + (i + 1) + "邀请了一位好友,获得了" + invitewarm + "温度值";
let itxt = othername[i] + "邀请了一位好友,获得了" + invitewarm + "温度值";
this.addAttionTxt(itxt);
let inroomidx = i + 1;
let inwd = this.data.roomdata[inroomidx]["wd"];
......@@ -458,12 +486,13 @@ Page({
//机器人完成任务
aitask(tasknums, i) {
let chatime = Math.floor(gameatime / tasknums) * 1000;
let othername = this.data.othername
for (let i1 = 0; i1 < tasknums; i1++) {
let i1start = i1 * chatime;
let i1end = (i1 + 1) * chatime - 5000;
let rangetime = Math.floor(Math.random() * (i1end - i1start)) + i1start;
setTimeout(() => {
let itxt = "玩家" + (i + 1) + "完成了一个任务,获得了" + taskwarm + "温度值";
let itxt = othername[i] + "完成了一个任务,获得了" + taskwarm + "温度值";
this.addAttionTxt(itxt);
let inroomidx = i + 1;
let inwd = this.data.roomdata[inroomidx]["wd"];
......@@ -473,12 +502,31 @@ Page({
}
},
onShow() {
let ntime = Date.now();
let hidetime = this.data.hidetime;
if(hidetime){
let passtime = ntime-hidetime;
let gametime = this.data.gametime;
gametime -= passtime/1000;
if(gametime<0){
gametime = 0;
}
this.setData({
gametime:gametime
});
}
let ngametime = this.data.gametime;
if ((this.data.isnew > 0 && this.data.isnew < 7) || this.data.show_v != 2 || ngametime <= 0) {
return;
}
this.updateActInfo();
},
onHide(){
let ntime = Date.now();
this.setData({
hidetime:ntime
});
},
//更新活动信息
//30s刷新一次邀请人列表,新增温度,结束前5s再请求一次,onshow请求一次
async updateActInfo() {
......@@ -821,7 +869,7 @@ Page({
}
if (taskcount > 0 && taskwarm > 0) {
this.newAiControl("task", taskcount);
let tasktxt = "完成了" + taskcount + "个任务,获得了" + taskwarm + "温度值";
let tasktxt = "完成了" + taskcount + "个任务,获得了" + taskwarm + "温度值";
this.addAttionTxt(tasktxt);
}
//邀请的单独来
......@@ -850,7 +898,7 @@ Page({
let chawarm = ndata.warms - ldata.warms;
let iattiontxt = "";
if (type == "invite") {
iattiontxt = "邀请" + chacount + "人" + "获得了" + chawarm + "温度值";
iattiontxt = "邀请" + chacount + "人" + "获得了" + chawarm + "温度值";
this.setData({
inviteshowdata: {
chacount: chacount,
......@@ -859,7 +907,7 @@ Page({
});
this.openInvite();
} else if (type == "tool") {
iattiontxt = "使用道具" + chacount + "次" + "获得了" + chawarm + "温度值";
iattiontxt = "使用道具" + chacount + "次" + "获得了" + chawarm + "温度值";
} else if (type == "follow") {
return [chacount, chawarm];
// iattiontxt = "完成任务follow" + chacount + "次" + "获得了" + chawarm + "温度值";
......
This diff is collapsed.
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