Commit 9eb05947 authored by 韦燕's avatar 韦燕

feat:merge

parent 3adbbe31
<!doctype html><html lang="zh"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="dns-prefetch" href="//yun.duiba.com.cn"/><link rel="preconnect" href="//embedlog.duiba.com.cn"><title>赚钱秒来劲</title><script>if (localStorage && localStorage.isWebp) {
document
.getElementsByTagName('html')[0]
.setAttribute('duiba-webp', 'true');
<!doctype html><html lang="zh"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="dns-prefetch" href="//yun.duiba.com.cn"/><link rel="preconnect" href="//embedlog.duiba.com.cn"><title>赚钱秒来劲</title><script>if (localStorage && localStorage.isWebp) {
document
.getElementsByTagName('html')[0]
.setAttribute('duiba-webp', 'true');
}</script><script src="//yun.duiba.com.cn/spark/v2/spark.base.fz.wxpollyfill.js"></script><script src="//yun.duiba.com.cn/js-libs/rem/1.1.3/rem.min.js"></script><script src="//yun.duiba.com.cn/h5/lib/zepto.min.js"></script><script>"use strict";
var CFG = CFG || {};
......@@ -14,6 +14,6 @@ function getUrlParam(name) {
CFG.appID = '${APPID}';
if (!getUrlParam("appID")) {
// alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
}</script><link href="//yun.duiba.com.cn/spark/v2/temp_base/1744699242883/styles/main.e9c575ca832e35b342ed.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>"use strict";
}</script><link href="//yun.duiba.com.cn/spark/v2/temp_base/1744706512999/styles/main.e55bab00454eb4ddb692.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>"use strict";
CFG.___G___ = 'origin%09http%3A%2F%2Fgitlab2.dui88.com%2Fsparkprojects%2FKWW-520NumberGuessingGame-20250409%20(fetch)%3Borigin%09http%3A%2F%2Fgitlab2.dui88.com%2Fsparkprojects%2FKWW-520NumberGuessingGame-20250409%20(push)%3Bmaster%3Bwangzhujun%3B';</script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1744699242883/js/runtime-main.df965f77.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1744699242883/js/vendors.4b63809f.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1744699242883/js/main.911e8ea6.js" crossorigin="anonymous"></script></body></html>
\ No newline at end of file
CFG.___G___ = 'weiyan%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2FKWW-520NumberGuessingGame-20250409.git%20(fetch)%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2FKWW-520NumberGuessingGame-20250409.git%20(push)%3Bmaster%3B';</script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1744706512999/js/runtime-main.69bed8de.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1744706512999/js/vendors.5e30bdcb.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1744706512999/js/main.37269e4c.js" crossorigin="anonymous"></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){function r(r){for(var n,a,l=r[0],i=r[1],p=r[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="//yun.duiba.com.cn/spark/v2/temp_base/1744699242883/";var l=window.webpackJsonp=window.webpackJsonp||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var p=0;p<l.length;p++)r(l[p]);var f=i;t()}([]);
//# sourceMappingURL=runtime-main.df965f77.js.map
\ No newline at end of file
!function(e){function r(r){for(var n,a,l=r[0],i=r[1],p=r[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="//yun.duiba.com.cn/spark/v2/temp_base/1744706512999/";var l=window.webpackJsonp=window.webpackJsonp||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var p=0;p<l.length;p++)r(l[p]);var f=i;t()}([]);
//# sourceMappingURL=runtime-main.69bed8de.js.map
\ No newline at end of file
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
{"numOfComponents":2451,"numOfProject":2101}
\ No newline at end of file
{"numOfComponents":2451,"numOfProject":2152}
\ No newline at end of file
......@@ -5,6 +5,7 @@ module.exports = {
"message": "cillum pariatur quis sit nostrud",
"success": true,
"data": {
join: true,
"actStartTimestamp": 123,
"boxInfo": [
{
......
......@@ -10,5 +10,5 @@ module.exports ={
"IMAGE_Q2": 0.8,
"RES_PATH": "/src/assets/",
"RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/temp_base/1744685571710",
"JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1744699242883/js"
"JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1744706512999/js"
}
\ No newline at end of file
......@@ -96,7 +96,8 @@ class GamePage extends Component {
}, 1000);
}
newNumber1 = 0;
newNumber2 = 0;
// 生成加减
createAddition = () => {
......@@ -114,9 +115,15 @@ class GamePage extends Component {
}
this.currentOpt = addition;
const symbolInfo1 = this.createSymbol(addition, -1);
const symbolInfo2 = this.createSymbol(addition, 1);
// console.error(symbolInfo);
let symbolInfo2 = this.createSymbol(addition, 1);
// this.newNumber1 = this.calcNum(symbolInfo1.symbolName, -1);
// this.newNumber2 = this.calcNum(symbolInfo2.symbolName, 1);
// while (this.newNumber1 === this.newNumber2) {
// symbolInfo2 = this.createSymbol(addition, 1);
// this.newNumber2 = this.calcNum(symbolInfo2.symbolName, 1);
// }
console.error(symbolInfo1, symbolInfo2);
this.setState({
addition,
......@@ -136,7 +143,22 @@ class GamePage extends Component {
// 生成计算字符
createSymbol = (addition, pos) => {
const probabilityList = addition == 'plus' ? plusProbability : minusProbability;
let probabilityList = addition == 'plus' ? plusProbability : minusProbability;
if(this.currentNumber < 20) {
probabilityList = probabilityList.filter(item => item.name!='division')
}
if(pos == 1) {
probabilityList = probabilityList.filter(item => item.name != this.leftSymbol)
if(this.leftSymbol == 'division') {
probabilityList = probabilityList.filter(item => item.name!= 'multiplyFen')
}
if(this.leftSymbol == 'multiplyFen') {
probabilityList = probabilityList.filter(item => item.name!='division')
}
}
let probability = Math.random();
......@@ -150,29 +172,24 @@ class GamePage extends Component {
symbolText = probabilityList[i].symbolText;
symbolName = probabilityList[i].name;
if(pos == -1) this.leftSymbol = symbolName;
if(pos == 1 && symbolName == this.leftSymbol) {
if(i == probabilityList.length - 1) {
symbolText = probabilityList[0].symbolText;
symbolName = probabilityList[0].name;
} else {
symbolText = probabilityList[i + 1].symbolText;
symbolName = probabilityList[i + 1].name;
}
}
// if(pos == 1 && symbolName == this.leftSymbol) {
// if(i == probabilityList.length - 1) {
// symbolText = probabilityList[0].symbolText;
// symbolName = probabilityList[0].name;
// } else {
// symbolText = probabilityList[i + 1].symbolText;
// symbolName = probabilityList[i + 1].name;
// }
// }
break;
}
}
// console.error(symbolText, symbolName);
return this.createNum({symbolName, symbolText}, pos);
return this.createNum({
symbolName,
symbolText,
})
}
......@@ -182,12 +199,15 @@ class GamePage extends Component {
}
// 生成任意的数字
createNum = (symbolInfo) => {
createNum = (symbolInfo, pos) => {
// 这里分几种类型生成 都需要有范围限制
const { currentNum, addition } = this.state;
const symbolName = symbolInfo?.symbolName;
const symbolText = symbolInfo?.symbolText;
const operate = this.currentOpt == 'plus' ? 1 : -1;
const newNum1 = this.calcNum(symbolName, -1);
let number = 1;
......@@ -196,14 +216,35 @@ class GamePage extends Component {
switch(symbolName) {
case 'plus':
case 'doublePlus':
number = this.createSpecialNum(this.min - 1, this.max);
number = this.createSpecialNum(this.min, this.max);
if(pos == 1) {
let newNum2 = this.currentNumber + number * operate;
if(symbolName == 'doublePlus') {
newNum2 = this.currentNumber + number * 2 * operate;
}
if(newNum1 == newNum2) {
number = this.createSpecialNum(this.min, number);
}
}
break;
case 'minus':
// const _max = Math.floor(currentNum / 2);
number = this.createSpecialNum(this.min, Math.min(this.max, this.currentNumber));
if(pos == 1) {
let newNum2 = this.currentNumber - number;
if(newNum1 == newNum2) {
number = this.createSpecialNum(this.min, number);
}
}
break;
case 'multiplyZheng':
number = this.createSpecialNum(1, 9);
number = this.createSpecialNum(2, 9);
if(pos == 1) {
let newNum2 = this.currentNumber * number;
if(newNum1 == newNum2) {
number = number + 1;
}
}
break;
case 'multiplyFen':
if(this.currentOpt == 'plus') {
......@@ -219,15 +260,50 @@ class GamePage extends Component {
}
console.error("fen1", fen1, "fen2", fen2)
number = Math.round(fen2 / fen1);
// if(pos == 1) {
// let newNum2 = this.currentNumber * number;
// if(newNum1 == newNum2) {
// number = number + 1;
// }
// }
break;
case 'percent':
number = this.createSpecialNum(1, 100);
if(pos == 1) {
let newNum2 = Math.round(this.currentNumber + 1 * operate + number * this.currentNumber / 100);
if(newNum1 == newNum2) {
if(number + 10 < 100) {
number = number + 10;
} else {
number = 10
}
}
}
break;
case 'division':
number = 2;
number = 2
if(pos == 1) {
let newNum2 = this.currentNumber * number;
if(newNum1 == newNum2) {
if(number + 4 < Math.floor(this.currentNumber / 2)) {
number = number + 4;
} else {
number = Math.floor(this.currentNumber / 4)
}
}
}
break;
case 'minusDouble':
number = this.createSpecialNum(0, Math.min(99, Math.floor(this.currentNumber / 2)));
if(pos == 1) {
let newNum2 = this.currentNumber - number * 2;
if(newNum1 == newNum2) {
number = this.createSpecialNum(0, number);
}
}
break;
}
......@@ -245,7 +321,7 @@ class GamePage extends Component {
currentNumber = 1;
currentOpt = 'plus'
// 计算数字
calcNum(symbolName, index) {
calcNum(symbolName, index, yansuan) {
const {currentNum, symbolInfo1, symbolInfo2} = this.state;
let newNumber1 = this.currentNumber;
......@@ -267,7 +343,7 @@ class GamePage extends Component {
newNumber1 = Math.round(symbolInfo?.fen2 * newNumber1 / symbolInfo?.fen1);
break;
case 'percent':
newNumber1 += Math.round(symbolInfo?.number * newNumber1 / 100) * operate ;
newNumber1 = Math.round(newNumber1 + 1 * operate + symbolInfo?.number * newNumber1 / 100);
break;
case 'division':
newNumber1 = Math.round(newNumber1 / symbolInfo?.number);
......@@ -301,8 +377,11 @@ class GamePage extends Component {
const symbolName1 = symbolInfo1?.symbolName;
const symbolName2 = symbolInfo2?.symbolName;
const newNumber1 = this.calcNum(symbolName1, -1);
const newNumber2 = this.calcNum(symbolName2, 1);
let newNumber1 = this.calcNum(symbolName1, -1);
let newNumber2 = this.calcNum(symbolName2, 1);
// const newNumber1 = this.newNumber1;
// const newNumber2 = this.newNumber2;
console.error("左边", newNumber1, "右边", newNumber2)
// 如果是加法 先判断选择的是不是比另一个大 如果不是那就不用计算了
......@@ -339,7 +418,6 @@ class GamePage extends Component {
newNumber = index == -1 ? newNumber1 : newNumber2;
this.currentNumber = newNumber;
debugger
console.error("newNumber+++", this.currentNumber != this.state.currentNum)
if(this.currentOpt == 'plus' && this.currentNumber > 0 && this.currentNumber != this.state.currentNum) {
......
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