Merge remote-tracking branch 'origin/feature/skin' into release

src/api_s2c/event/huangqijiuguan/fun.ts

@@ -206,10 +206,11 @@ export default class HQJGFun {
     /** 设置我的数据 */
     static async setMyData(uid: string, hdid: number, update: { [k in keyof Partial<PlayerData>]: PlayerData[k] }) {
         let res = await G.mongodb.cEvent(this.dataType(hdid)).updateOne(
-            { uid: uid, type: this.dataType(hdid) }, { $set: update }
+            { uid: uid, type: this.dataType(hdid) }, { $set: update }, { upsert: true }
         );
 
-        if (res.modifiedCount <= 0) {
+        if (res.upsertedCount == 1) {
+            console.log("===>", uid, hdid, update);
             await G.mongodb.cEvent(this.dataType(hdid)).updateOne(
                 { uid: uid, type: this.dataType(hdid) }, { $set: Object.assign(this.defaultData, update) }
             );
@@ -433,7 +434,7 @@ export default class HQJGFun {
             return
         }
 
-        let mydata = await this.getMydata(call);
+        let mydata = await this.getMydata(call, hd);
         if (!mydata.giftbuy[gift.id]) {
             mydata.giftbuy[gift.id] = { num: 0, select: [] };
         }

src/shared/public/public.ts

@@ -124,6 +124,7 @@ export class PublicShared {
         else if (atn.a == 'item') return G.gc.item[atn.t];
         else if (atn.a == 'hero') return G.gc.hero[atn.t];
         else if (atn.a == 'equip') return G.gc.equip[atn.t];
+        else if (atn.a == 'heroskin') return G.gc.heroSkin[atn.t];
 
         return null;
     }