Merge branch 'feature/skin' into dev

src/api_s2c/heroskin/ApiWear.ts

@@ -17,7 +17,7 @@ export default async function (call: ApiCall<ReqWear, ResWear>) {
     }
 
     let skinconf = G.gc.heroSkin[call.req.skid];
-    if (skinconf.heroid != hero.heroId) { // 皮肤不属于该英雄
+    if (skinconf.heroId != hero.heroId) { // 皮肤不属于该英雄
         call.error(lng.hero_21);
         return;
     }

src/jsonType.ts

@@ -1814,7 +1814,7 @@ type gc_hero_skin = {
         /**皮肤id*/
         id: number
         /**干部id*/
-        heroid: number
+        heroId: number
         /**皮肤品质*/
         colour: number
         /**摸到重复时转换*/

src/shared/public/hero.ts

@@ -288,7 +288,7 @@ export class HeroShared {
         if (otherBuff?.heroskin) {
             for (let skinId in otherBuff.heroskin) {
                 let skinConf = G.gc.heroSkin[skinId];
-                if (skinConf.heroid != hero.heroId) console;
+                if (skinConf.heroId != hero.heroId) console;
                 PublicShared.mergeProperty(buff, HeroSkinFun.calcBuff(
                     skinId, otherBuff.heroskin[skinId]
                 ));