zhengshi 1 semana atrás
pai
commit
e825fcf8e4

+ 12 - 12
app/controllers/player.js

@@ -218,18 +218,18 @@ proto.createAsync = P.coroutine(function* (playerId, name, sex, headurl,tel,pwd,
         //myurl: _myurl || 'http://fhmj.jzb518.com/',
     });
     yield player.saveAsync();
-
-    // 钻石记录
-    var diamondrecord = new this.app.models.DiamondRecord({
-        _id: uuid.v1(),
-        playerId: playerId,
-        dType: 1,//注册
-        dSource: 0,
-        dSwap: diamondReg,
-        dNow: diamondReg
-    });
-    yield diamondrecord.saveAsync();
-
+    if (diamondReg != 0) {
+        // 钻石记录
+        var diamondrecord = new this.app.models.DiamondRecord({
+            _id: uuid.v1(),
+            playerId: playerId,
+            dType: 1,//注册
+            dSource: 0,
+            dSwap: diamondReg,
+            dNow: diamondReg
+        });
+        yield diamondrecord.saveAsync();
+    }
     var channelId = 'p:' + playerId;
     yield this.app.controllers.push.joinAsync(channelId, playerId);
     return player;

+ 2 - 1
app/models/game.js

@@ -397,7 +397,8 @@ module.exports = function (app) {
         withdrawfee: { type: Number, default: 3 },  //排行榜已发奖励的日期(0点时间戳)
         withdrawlowlimit: { type: Number, default: 10 },  //排行榜已发奖励的日期(0点时间戳)
         registerUstd:{ type: Number, default: 0 },
-        coinurl:{ type: String, default:'' }
+        coinurl:{ type: String, default:'' },
+        gamecontrol:{ type: mdbgoose.Schema.Types.Mixed }
     }, { collection: 'sgjconfig' });
 
     mdbgoose.model('SGJConfig', SGJConfigSchema);

+ 1 - 2
app/models/hall.js

@@ -81,7 +81,6 @@ module.exports = function (app) {
 
     mdbgoose.model('FishRefundUSDTRecord', FishRefundUSDTRecordSchema);
 
-
     var UsdtWithdrawRecordSchema = new mdbgoose.Schema({
         _id: { type: String },                                      // 订单号
         chainCode: { type: String, default: ''  },                                 // 玩家ID
@@ -110,7 +109,7 @@ module.exports = function (app) {
     var PayLimitSchema = new mdbgoose.Schema({
         _id: { type: String },                                      // 标识
         userId: { type: Number },                                   // 号码
-        name: { type: Schema.Types.Mixed, default: '' },                        // 昵称
+        name: { type: String, default: '' },                        // 昵称
         paytop: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },                       // 充值上限,-1表示没有设置上限
         paytotal: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },                     // 充值总额
         dataTime: { type: Number, default: 0, set: function(value) {return Number(Number(value).toFixed(2));}, get: function(value) {return Number(Number(value).toFixed(2));} },                     // 充值总额对应的日期时间

+ 1 - 0
app/servers/hall/handler/hallHandler.js

@@ -3211,6 +3211,7 @@ proto.sgjConfig = P.coroutine(function* (msg, session, next) {
         var SGJConfig = SGJConfigs[0]
         data.withdrawfee = SGJConfig.withdrawfee
         data.withdrawlowlimit = SGJConfig.withdrawlowlimit
+        data.gamecontrol = SGJConfig.gamecontrol
     }
 
 

+ 6 - 6
app/shuiguo/table.js

@@ -552,7 +552,7 @@ proto.joinAsync = cor(function* (user) {
             if(ssbkdrdd < 0){
                 //适合比如身上有14w钻石,带入10w之后,被系统扣钻了8w,那这时候数据表的drCount字段就要改了
                 console.warn("457:",sgjUser.drCount)
-                drCount = user.diamond.toFixed(2);//1分=10钻石,每日上限1w分)
+                drCount = Number(user.diamond).toFixed(2);//1分=10钻石,每日上限1w分)
                 console.warn("457:",sgjUser.drCount)
                 // console.warn("加入桌子非今天首次1===  drCount "+drCount+" ssbkdrdd "+ssbkdrdd+" sgjUser.jrkbcdrs "+sgjUser.jrkbcdrs);
             }
@@ -570,7 +570,7 @@ proto.joinAsync = cor(function* (user) {
                 drCount = this.logic.dairuMax.toFixed(2);//(钻石)
             }
             else{
-                drCount = user.diamond.toFixed(2);//1分=10钻石,每日上限1w分)
+                drCount = Number(user.diamond).toFixed(2);//1分=10钻石,每日上限1w分)
                 let ssbkdrdd = user.diamond - drCount;//身上比可带入多的钻石
                 console.warn("ssbkdrdd:",ssbkdrdd)
                 if(ssbkdrdd > this.logic.dairuMax - sgjUser.drCount){
@@ -597,11 +597,11 @@ proto.joinAsync = cor(function* (user) {
         }
         else{
             console.warn("user.diamond;",user.diamond)
-            drCount = user.diamond.toFixed(2);//1分=10钻石,每日上限1w分)
+            drCount = Number(user.diamond).toFixed(2);//1分=10钻石,每日上限1w分)
             console.warn("drCount",drCount)
         }
     }
-    user.diamond = user.diamond.toFixed(2)
+    user.diamond = Number(user.diamond).toFixed(2)
     let str3 = "加入水果 "+ this.nowDiamond2 +"  ud  "+user.diamond + " drCount " + drCount;
     if(this.users.length == 0) {
         this.users[0] = user;
@@ -1133,7 +1133,7 @@ proto.dairuAsync = cor(function* (playerId,chairId) {
                 }
                 if(ssbkdrdd < 0){
                     //适合比如身上有14w钻石,带入10w之后,被系统扣钻了8w,那这时候数据表的drCount字段就要改了
-                    drCount = user.diamond .toFixed(2);//Math.floor(user.diamond / this.logic.nowCell)*this.logic.nowCell;//1分=10钻石,每日上限1w分)
+                    drCount = Number(user.diamond) .toFixed(2);//Math.floor(user.diamond / this.logic.nowCell)*this.logic.nowCell;//1分=10钻石,每日上限1w分)
                     sgjUser.drCount = drCount;
                     sgjUser.lastJoinTime = nowTime;   // 玩家上次进入果游戏时间(留存人数)
                     yield sgjUser.saveAsync();
@@ -1153,7 +1153,7 @@ proto.dairuAsync = cor(function* (playerId,chairId) {
                 }
             }
             else{
-                drCount = user.diamond.toFixed(2);//Math.floor(user.diamond / this.logic.nowCell)*this.logic.nowCell;//1分=10钻石,每日上限1w分)
+                drCount = Number(user.diamond).toFixed(2);//Math.floor(user.diamond / this.logic.nowCell)*this.logic.nowCell;//1分=10钻石,每日上限1w分)
                 sgjUser.drCount = drCount;
                 sgjUser.lastJoinTime = nowTime;   // 玩家上次进入果游戏时间(留存人数)
                 yield sgjUser.saveAsync();

+ 1 - 4
robot.py

@@ -38,10 +38,7 @@ Bar Game 是一款轻松有趣、随时随地畅玩的线上休闲娱乐平台
 
 📱 全机型适配,随时随地想玩就玩
 
-✨ 无需下载 App,无需注册,打开即可立即体验
-
-休闲娱乐就来 Bar Game,轻松、有趣、更安心!
-    """
+✨ 无需下载注册,打开即玩,轻松安心✨ """
 
     # 2. 构建多行自定义键盘(完全匹配你要的样式)
     # 每行按钮用[]包裹,多个按钮逗号分隔,row()表示换行