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

# Conflicts:
#	src/public/fight.ts
#	src/public/player.ts
#	zoeninfo.sh

src/api_s2c/ApiBingo.ts

@@ -142,7 +142,7 @@ export default async function (call: ApiCall<ReqBingo, ResBingo>) {
         if (shell[3]) emailMsg.prize = JSON.parse(shell[3])
         EmailFun.addEmail(emailMsg);
     } else if (shell[0] == "heroskin") {
-        await PlayerFun.sendPrize(call, [{ a: "heroskin", "t": shell[1], n: 1 }]);
+        PlayerFun.sendPrize(call, [{ a: "heroskin", "t": shell[1], n: 1 }]);
     }
 
     call.succ('succ');

src/cross/protocols/serviceProto.ts

@@ -1319,20 +1319,6 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 },
                 {
                     "id": 38,
-                    "name": "weiwangbuff",
-                    "type": {
-                        "type": "Interface",
-                        "indexSignature": {
-                            "keyType": "String",
-                            "type": {
-                                "type": "Number"
-                            }
-                        }
-                    },
-                    "optional": true
-                },
-                {
-                    "id": 39,
                     "name": "heroskin",
                     "type": {
                         "type": "Interface",
@@ -1739,23 +1725,9 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 {
                     "id": 8,
                     "name": "skin",
-                    "type": {
-                        "type": "Union",
-                        "members": [
-                            {
-                                "id": 0,
                     "type": {
                         "type": "String"
                     }
-                            },
-                            {
-                                "id": 1,
-                                "type": {
-                                    "type": "Number"
-                                }
-                            }
-                        ]
-                    }
                 }
             ]
         },

src/encrypt.ts

@@ -11,7 +11,6 @@ export class Encrypt {
         if (buf instanceof Uint8Array) {
             return decryptUint8Array(buf);
         }
-        
         return buf;
     }
 }

src/extends.ts

@@ -1,4 +1,3 @@
-
 import 'tsrpc';
 import { ApiCall, BaseConnection, ConnectionStatus, WsServer } from 'tsrpc';
 import { Wjjl } from './module/collection_wjjl';
@@ -133,7 +132,7 @@ BaseConnection.prototype.getDefaultFightData = async function (this: BaseConnect
         posObj = this.gud.matrixPos[this.gud.selectMatrix];
     }
 
-    let heros = await HeroFun.getHeros(this, Object.values(posObj).filter(_id => _id != ''));
+    let heros = await HeroFun.getHeros(this, Object.values(posObj).filter(_id => _id != '') as string[]);
 
     Object.entries(posObj).forEach(obj => {
         let pos = obj[0];

src/json/pay.json

@@ -5067,8 +5067,8 @@
     "firstPayPrize": [],
     "name": "pay_name_daojulibao_1",
     "undefined": "专属润滑剂不足_30",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5108,8 +5108,8 @@
     "firstPayPrize": [],
     "name": "pay_name_daojulibao_2",
     "undefined": "专属润滑剂不足_68",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5149,8 +5149,8 @@
     "firstPayPrize": [],
     "name": "pay_name_daojulibao_3",
     "undefined": "专属润滑剂不足_128",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5190,8 +5190,8 @@
     "firstPayPrize": [],
     "name": "pay_name_daojulibao_4",
     "undefined": "配件零件不足_30",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5231,8 +5231,8 @@
     "firstPayPrize": [],
     "name": "pay_name_daojulibao_5",
     "undefined": "配件零件不足_68",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5272,8 +5272,8 @@
     "firstPayPrize": [],
     "name": "pay_name_daojulibao_6",
     "undefined": "配件零件不足_128",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5313,8 +5313,8 @@
     "firstPayPrize": [],
     "name": "pay_name_daojulibao_7",
     "undefined": "装备蓝图不足_30",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5354,8 +5354,8 @@
     "firstPayPrize": [],
     "name": "pay_name_daojulibao_8",
     "undefined": "装备蓝图不足_68",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5395,8 +5395,8 @@
     "firstPayPrize": [],
     "name": "pay_name_daojulibao_9",
     "undefined": "装备蓝图不足_128",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5436,8 +5436,8 @@
     "firstPayPrize": [],
     "name": "pay_name_daojulibao_10",
     "undefined": "调校合金不足_30",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5477,8 +5477,8 @@
     "firstPayPrize": [],
     "name": "pay_name_daojulibao_11",
     "undefined": "调校合金不足_68",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5518,8 +5518,8 @@
     "firstPayPrize": [],
     "name": "pay_name_daojulibao_12",
     "undefined": "调校合金不足_128",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5549,8 +5549,8 @@
     "firstPayPrize": [],
     "name": "pay_name_zhanbailibao_1",
     "undefined": "战败礼包_68",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5580,8 +5580,8 @@
     "firstPayPrize": [],
     "name": "pay_name_zhanbailibao_2",
     "undefined": "战败礼包_68",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"
@@ -5611,8 +5611,8 @@
     "firstPayPrize": [],
     "name": "pay_name_zhanbailibao_3",
     "undefined": "战败礼包_68",
-    "time": 1,
-    "buys": 1,
+    "time": -1,
+    "buys": 0,
     "needVip": 0,
     "front": {},
     "currency": "CNY"

src/jsonType.ts

@@ -1811,29 +1811,6 @@ type gc_push_gift = {
     }
 }
 
-type gc_hero_skin = {
-    [k: string]: {
-        /**皮肤id*/
-        id: number
-        /**干部id*/
-        heroId: number
-        /**皮肤品质*/
-        colour: number
-        /**摸到重复时转换*/
-        zhuanhuan: atn[]
-    }
-}
-
-type gc_hero_skin_lv = {
-    [colour: string]: {
-        [lv: string]: {
-            suipian: number
-            buff: { [k: string]: number }
-            need: { a: string, t: string, n: number }[];
-        }
-    }
-}
-
 type gcType = {
     [key: string]: any
     armyattr: gc_armyattr
@@ -1983,9 +1960,7 @@ type gcType = {
     kfcb_prize: gc_kfcb_prize
     yuyuemail: gc_yuyuemail
     tuisonglibao: gc_push_gift
-    renown_level: gc_renown_level
-    heroSkin: gc_hero_skin
-    heroSkinLv: gc_hero_skin_lv
+
 }
 
 
@@ -1996,3 +1971,4 @@ declare global {
 export function initGcType() {
 
 }
+        

src/localConfig.ts

@@ -23,7 +23,7 @@ export default {
     /**cross mongodb url */
     crossMongodbUrl: 'mongodb://root:lyMaple525458@10.0.1.20:27017/heijiao_cross?authSource=admin',
     /**运营平台接口地址 */
-    baseUrl: 'blacklagoon-slb.pro.g123-cpp.com',
+    baseUrl: 'https://blacklagoon-slb.stg.g123-cpp.com',
     /**服务器时间 */
     time: '',
     /**开服时间 */

src/monopoly/protocols/serviceProto.ts

@@ -2640,20 +2640,6 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 },
                 {
                     "id": 38,
-                    "name": "weiwangbuff",
-                    "type": {
-                        "type": "Interface",
-                        "indexSignature": {
-                            "keyType": "String",
-                            "type": {
-                                "type": "Number"
-                            }
-                        }
-                    },
-                    "optional": true
-                },
-                {
-                    "id": 39,
                     "name": "heroskin",
                     "type": {
                         "type": "Interface",

src/public/player.ts

@@ -19,9 +19,9 @@ import { getGud, setGud } from './gud';
 import { addGameLog } from "../gameLog";
 import { PushGiftFun } from "./pushgift";
 import { ActionLog } from './actionLog/actionLog';
+import HeroSkinFun from './heroskin';
 import { roleDataType } from '../shared/fightControl/fightType';
 import { PlayerShared } from '../shared/public/player';
-import HeroSkinFun from './heroskin';
 
 
 export type call = {

src/public/scheduler/scheduler_newDay.ts

@@ -64,41 +64,6 @@ export class SchedulerNewDayLocalCtor extends Scheduler {
             G.emit('NEW_DAY', G.time);
         })
 
-
-        clusterRunOnce(async ()=>{
-            //这个定时器会被每个进程都启动，这是这部分逻辑，应该只执行1次
-
-            //重置所有的ActionLog
-            await ActionLog.initAllDayLog();
-
-            // 每周一，发放终身卡
-            (async () => {
-                if (PublicShared.getWeek(G.time) == 1) {
-                    let logs = await G.mongodb.collection("payLogNew").find(
-                        { key: "zhongshenka", del_time: { $exists: false } }, { projection: { _id: 0, } }
-                    ).toArray();
-
-                    if (logs.length == 0) {
-                        console.log("没有终身卡数据，不发放终身卡");
-                    }
-                    let con = G.gc.payEmail.zhongshenka.filter(e => e.day == 7)[0];
-                    for (let i = 0; i < logs.length; i++) {
-                        console.log("发放终身卡", logs[i].uid);
-                        // 发送邮件
-                        EmailFun.addEmail({
-                            uid: logs[i].uid,
-                            type: "system",
-                            title: con.title,
-                            content: con.content,
-                            contentInsertArr: [],
-                            createTime: G.time,
-                            prize:con.prize,
-                        })
-                    }
-                }
-            })()
-        })
-
         let users = Object.values(G.server.uid_connections)
         if (users.length) {
             for (let item of users) {

src/public/task.ts

@@ -4,6 +4,7 @@ import { taskType } from "../shared/protocols/task/type";
 import { PublicShared } from "../shared/public/public";
 import { PeijianFun } from "./peijian";
 import { manager } from "./taskclass";
+import ApiRecTask from "../api_s2c/event/zhanling/ApiRecTask";
 
 let taskDict = {};
 const SHUJUKU = "task";

src/public/taskclass.ts

@@ -813,7 +813,7 @@ export module manager {
         isinc = 1
 
         async initVal(call: ApiCall, con) {
-            return 0;
+            return 1;
         }
     }
     // 第59个任务 获得vip经验

src/public/user.ts

@@ -301,6 +301,9 @@ export class UserFun {
                     change = true;
                     gud.headFrames[conf.id] = G.time + val * v;
                 }
+            } else if (conf?.cond?.[0] == "jjc_rank") {
+                change = true;
+                gud.headFrames[conf.id] = -1;
             }
             else if(conf?.cond?.[0] == "jjc_rank") {
                     change = true;

src/shared/public/hero.ts

@@ -7,6 +7,7 @@ import { PlayerShared } from './player';
 import { PublicShared } from './public';
 import { ShiwuShared } from './shiwu';
 
+
 export type otherBuff = Partial<player & {
     allBuff: k_v<number>;
 }>;
@@ -279,11 +280,6 @@ export class HeroShared {
             }
         }
 
-        // 威望加成计算
-        if (otherBuff?.weiwangbuff) {
-            PublicShared.mergeProperty(buff, otherBuff?.weiwangbuff || {});
-        }
-
         // 计算皮肤buff
         if (otherBuff?.heroskin) {
             for (let skinId in otherBuff.heroskin) {
@@ -295,6 +291,11 @@ export class HeroShared {
             }
         }
 
+        // 威望加成计算
+        if (otherBuff?.weiwangbuff) {
+            PublicShared.mergeProperty(buff, otherBuff?.weiwangbuff || {});
+        }
+
         //最后进行加成属性计算
         for (let k in buff) {
             if (k.indexOf('pro') == -1) continue;

src/shared/public/user.ts

@@ -37,7 +37,7 @@ export class UserShared {
         // else if (conf.cond[0] == 'time') return collection.active[fmtId] == -1 || collection.active[fmtId] > G.time;
         else if (conf.cond[0] == 'time') return conf.cond[1] == -1 || collection.active?.[fmtId] > G.time;
         else if (conf.cond[0] == 'model') return Object.values(collection.model).find(i => i.id == conf.cond[1]);
-        else if (conf.cond[0] == 'heroskin') return conf.cond[1] in collection.heroskin;
+        else if (conf.cond[0] == 'heroskin') return conf.cond[1] in (collection.heroskin || {});
         else return false;
     }
 }

zoeninfo.sh

@@ -3,8 +3,3 @@
 cp "/usr/share/zoneinfo/$1" "/etc/localtime"
 echo "$1" > /etc/timezone
 
-for i in `env | grep -E -i 'SERVER_GAME' | sed 's/=.*//'` ; do
-    unset $i
-done
-
-