Merge remote-tracking branch 'origin/bugfix' into bugfix

# Conflicts:
#	src/api_s2c/event/leijichongzhi/ApiRec.ts

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "ms-ceintl.vscode-language-pack-zh-hans"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "editor.suggest.snippetsPreventQuickSuggestions": false,
+    "aiXcoder.showTrayIcon": true
+}

src/api_s2c/event/leijichongzhi/ApiOpen.ts

@@ -25,7 +25,7 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
     }
     db = await checkNextRound(call, db, _hdinfo)
 
-    let payNum = (await PayFun.getPayDaysAllPayNum(call.uid, _hdinfo.stime, _hdinfo.etime)) * 10
+    let payNum = (await PayFun.getPayDaysAllPayNum(call.uid, _hdinfo.stime, _hdinfo.rtime)) * 10
     payNum = payNum - (db?.round || 0) * R.sort((a, b) => b.total - a.total)(_hdinfo.data.tasks)[0].total
 
     call.succ({

src/api_s2c/event/xiaofeijingsai/ApiOpen.ts

@@ -72,17 +72,7 @@ async function getMyData(call: ApiCall, rankList) {
     })
 
     let myUser = await G.mongodb.collection('user').findOne({uid: call.uid})
-    G.crossmongodb.collection('huodong_user').updateOne({uid: call.uid}, {
-        $set: {
-            lv: myUser.lv,
-            vip: myUser.vip,
-            name: myUser.name,
-            sid: myUser.sid,
-            nexp: myUser.nexp,
-            head: myUser.head,
-            headFrame: myUser.headFrame
-        }
-    }, {upsert: true})
+    G.crossmongodb.collection('huodong_user').updateOne({uid: call.uid}, {$set: myUser}, {upsert: true})
 
     if (!myCut) {
         myCut = {_id: myUser.uid, total: 0}

src/api_s2c/eventlist/ApihdGetList.ts

@@ -14,16 +14,6 @@ export default async function (call: ApiCall<ReqhdGetList, ReshdGetList>) {
     if (G.huodong.xfjs) {
         G.huodong.xfjsId = _hdList.find(i => i.htype == 11).hdid
         let myUser = await G.mongodb.collection('user').findOne({uid: call.uid})
-        G.crossmongodb.collection('huodong_user').updateOne({uid: call.uid}, {
-            $set: {
-                lv: myUser.lv,
-                vip: myUser.vip,
-                name: myUser.name,
-                sid: myUser.sid,
-                nexp: myUser.nexp,
-                head: myUser.head,
-                headFrame: myUser.headFrame
-            }
-        }, {upsert: true})
+        G.crossmongodb.collection('huodong_user').updateOne({uid: call.uid}, {$set: myUser}, {upsert: true})
     }
 }

src/extends.ts

@@ -251,7 +251,7 @@ BaseConnection.prototype.refreshPower = async function (this: BaseConnection<Ser
         this.sendMsg('msg_s2c/PlayerChange', dbUpdate);
 
         let rankKfjs = RankKfjs(7)
-        rankKfjs.setDataAndCheck({
+        rankKfjs?.setDataAndCheck({
             player: this.gud,
             valArr: [power]
         });
@@ -333,7 +333,7 @@ ApiCall.prototype.addEventMsg = function (this: ApiCall) {
             if (Object.keys(this.otherBuff).intersection(Object.keys(msg)).length > 0) this.conn.refreshPower();
             break;
         case 'msg_s2c/LshdChange':
-            this.conn.lshd[msgKey] && PublicShared.mergeProperty(this.conn.lshd[msgKey], msg);
+            this.conn?.lshd?.[msgKey] && PublicShared.mergeProperty(this.conn.lshd[msgKey], msg);
             break;
     }
 };

src/localConfig.ts

@@ -2,22 +2,22 @@
 export default {
     /**时区偏移量 */
     utc: 8,
-    /**是否开发模式 */
+/**是否开发模式 */
     debug: true,
     /**消息服socket端口*/
     msgPort: 7778,
     /**http端口 msg服专用*/
-    // httpPort: 7779,
+    httpPort: 7779,
     /**跨服socket端口 */
     crossPort: 7780,
     /**跨服 ws url */
-    corssWsUrl: "ws://10.0.1.20:10003",
+    corssWsUrl: "ws://localhost:7780",
     /**服务器id */
-    serverId: 1001,
+    serverId: 15,
     /**redis url */
     redisUrl: 'redis://:lyMaple525458@10.0.1.20:6379/0',
     /**mongodb url */
-    mongodbUrl: 'mongodb://root:lyMaple525458@10.0.1.20:27017/heijiao?authSource=admin',
+    mongodbUrl: 'mongodb://root:lyMaple525458@10.0.1.20:27017/heijiao_cl?authSource=admin',
     /**cross redis url */
     crossRedisUrl: 'redis://:lyMaple525458@10.0.1.20:6379/1',
     /**cross mongodb url */
@@ -27,11 +27,13 @@ export default {
     /**服务器时间 */
     time: '',
     /**开服时间 */
-    openTime: '2023-12-11 1:0:0',
+    openTime: '2023-12-05 01:00:00',
     /**项目名称 */
     projectName: 'heijiao',
     /**加密key */
     APIKEY: 'uutown123456',
+    /**是否已经开区 */
+    opened:true,
     /**wss */
     wss: {
         key: '',