Merge remote-tracking branch 'upstream/master'

Author: tinymins

!src-dist/src/global.classic_yq.lua

@@ -166,7 +166,7 @@ arg99 = AnyType
 assert = FunctionType
 ATTRIBUTE_EFFECT_MODE = TableType
 ATTRIBUTE_TYPE = TableType
-AUCTION_COOL_DOWN_ERROR_CODE = TableType
+AUCTION_ERROR_CODE = TableType
 AUCTION_ITEM_LIST_TYPE = TableType
 AUCTION_MESSAGE_CODE = TableType
 AUCTION_ORDER_TYPE = TableType
@@ -190,6 +190,9 @@ BigBagPanel = TableType
 BigIntAdd = FunctionType
 BigIntSub = FunctionType
 BM_SELL_TYPE = TableType
+BODY_BONE_TYPE = TableType
+BODY_RESHAPING_ERROR_CODE = TableType
+BODY_RESHAPING_OPERATE_METHOD = TableType
 BookID2GlobelRecipeID = FunctionType
 Box_AppendAddonMenu = FunctionType
 Box_GetAddonMenu = FunctionType
@@ -280,6 +283,7 @@ CONDITION_TYPE = TableType
 Conversion2ChineseNumber = FunctionType
 ConvertCodePage = FunctionType
 coroutine = TableType
+CoroutineMgr = TableType
 CORPS_OPERATION_RESULT_CODE = TableType
 CORPS_OPERATION_TYPE = TableType
 CorrectSkillName = FunctionType
@@ -340,6 +344,7 @@ EQUIPMENT_REPRESENT = TableType
 EQUIPMENT_SUB = TableType
 error = FunctionType
 ERROR_CODE_TYPE = TableType
+ExecuteScriptCommand = FunctionType
 EXTERIOR_APPLY_FLAG = TableType
 EXTERIOR_APPLY_RESPOND_CODE = TableType
 EXTERIOR_BUY_RESPOND_CODE = TableType
@@ -714,6 +719,7 @@ MAIN_SCENE_DOF_DIST_MIN = NumberType
 MAIN_SCENE_DOF_NEAR_MIN = NumberType
 MainMessageLine = TableType
 MAP_CAMP_TYPE = TableType
+MAP_OPERATION_TYPE = TableType
 MAP_QUEUE_TYPE = TableType
 MAP_TYPE = TableType
 MATCH_QUEUE_RESULT_CODE = TableType
@@ -727,6 +733,7 @@ MAX_L_SHOULDER_SIZE = NumberType
 MAX_R_SHOULDER_SIZE = NumberType
 MAX_WAIST_SIZE = NumberType
 MD5 = FunctionType
+MEET_STATE = TableType
 MENTOR_RECORD_STATE = TableType
 MENU_DIVIDER = TableType
 MessageBox = FunctionType
@@ -744,6 +751,7 @@ MoneyOptMult = FunctionType
 MoneyOptSub = FunctionType
 MoneyToGoldSilverAndCopper = FunctionType
 MONTH_CARD_BP_ID = TableType
+MORPH_TYPE = TableType
 MOVE_STATE = TableType
 MOVIE = TableType
 Navigator_Remove = FunctionType
@@ -752,7 +760,15 @@ Navigator_SetPoint = FunctionType
 NEW_CAMP_FIGHT_VALUE_TYPE = TableType
 NEW_EMOTION_TYPE = TableType
 next = FunctionType
+NPC_ASSISTED_ITEM_SUB = TableType
+NPC_ASSISTED_RESULT_CODE = TableType
 NPC_DISPLAY_MODE = TableType
+NPC_EQUIP_REPRESENT = TableType
+NPC_EQUIPMENT_SUB = TableType
+NPC_EXTERIOR_ERROR_CODE = TableType
+NPC_EXTERIOR_OPERATE_METHOD = TableType
+NPC_EXTERIOR_SOURCE_TYPE = TableType
+NPC_EXTERIOR_TYPE = TableType
 NPC_GetHeadImageFile = FunctionType
 NPC_GetProtrait = FunctionType
 NPC_SPECIES_TYPE = TableType
@@ -808,6 +824,7 @@ pairs_c = FunctionType
 ParseCareerEventTab = FunctionType
 ParseEmotionCommand = FunctionType
 ParseNumbers = FunctionType
+PARTNER_TEAM_TYPE = TableType
 PARTY_LOOT_MODE = TableType
 PARTY_MARK_ICON_FRAME_LIST = TableType
 PARTY_MARK_ICON_PATH = StringType
@@ -840,6 +857,7 @@ Player_GetFrame = FunctionType
 Player_GetRidesAnimationResource = FunctionType
 Player_GetRidesEquipResource = FunctionType
 PLAYER_IDENTITY_TYPE = TableType
+PLAYER_OPERATION_TYPE = TableType
 PLAYER_PREPARE_FELLOWSHIP_RESULT = TableType
 PLAYER_SFX_REPRESENT = TableType
 PLAYER_TALK_CHANNEL = TableType
@@ -1015,6 +1033,7 @@ Table_GetAchievementDLCReward = FunctionType
 Table_GetAchievementInfo = FunctionType
 Table_GetAchievementProgress = FunctionType
 Table_GetAchievementSubDLC = FunctionType
+Table_GetActivityBPReward = FunctionType
 Table_GetActivityContent = FunctionType
 Table_GetActivityHome = FunctionType
 Table_GetActivityIDByOperActID = FunctionType
@@ -1035,6 +1054,10 @@ Table_GetAllKBWeekReward = FunctionType
 Table_GetAllKungfuSkillList = FunctionType
 Table_GetAllMasterBunusItem = FunctionType
 Table_GetAllOutsideFilterParams = FunctionType
+Table_GetAllPartnerNpcInfo = FunctionType
+Table_GetAllPartnerTravelMainClass = FunctionType
+Table_GetAllPartnerTravelTask = FunctionType
+Table_GetAllPartnerTravelTeam = FunctionType
 Table_GetAllPersonLabel = FunctionType
 Table_GetAllSceneQuest = FunctionType
 Table_GetAllSelfieFilterParams = FunctionType
@@ -1059,6 +1082,8 @@ Table_GetBattlePassRewardInfo = FunctionType
 Table_GetBidNpcName = FunctionType
 Table_GetBigDungeonList = FunctionType
 Table_GetBoardGameCardInfo = FunctionType
+Table_GetBodyBoneList = FunctionType
+Table_GetBodyClothList = FunctionType
 Table_GetBookContent = FunctionType
 Table_GetBookDesc = FunctionType
 Table_GetBookItemIndex = FunctionType
@@ -1139,6 +1164,7 @@ Table_GetDanmakuColor = FunctionType
 Table_GetDecal = FunctionType
 Table_GetDecalsAdjust = FunctionType
 Table_GetDecorationList = FunctionType
+Table_GetDefaultBodyInfo = FunctionType
 Table_GetDefaultLine = FunctionType
 Table_GetDesertStormSkill = FunctionType
 Table_GetDesertStormSkillFilter = FunctionType
@@ -1293,6 +1319,7 @@ Table_GetNpcGuild = FunctionType
 Table_GetNPCNameVisibleList = FunctionType
 Table_GetNpcTemplateName = FunctionType
 Table_GetNpcTypeInfoMap = FunctionType
+Table_GetOfficalBodyList = FunctionType
 Table_GetOfficalFaceList = FunctionType
 Table_GetOneIdentityInfo = FunctionType
 Table_GetOneKindAdventure = FunctionType
@@ -1308,6 +1335,30 @@ Table_GetOperationActivity = FunctionType
 Table_GetOperationActivityByID = FunctionType
 Table_GetOperationActUserData = FunctionType
 Table_GetParentSkill = FunctionType
+Table_GetPartnerActSetting = FunctionType
+Table_GetPartnerActVoiceInfo = FunctionType
+Table_GetPartnerAllKungfuInfo = FunctionType
+Table_GetPartnerByTemplateID = FunctionType
+Table_GetPartnerCombatInfo = FunctionType
+Table_GetPartnerDrawStory = FunctionType
+Table_GetPartnerGiftInfo = FunctionType
+Table_GetPartnerKungfuInfo = FunctionType
+Table_GetPartnerMessage = FunctionType
+Table_GetPartnerMorphSkill = FunctionType
+Table_GetPartnerNpcInfo = FunctionType
+Table_GetPartnerQualityInfo = FunctionType
+Table_GetPartnerSkillEffect = FunctionType
+Table_GetPartnerSkillInfo = FunctionType
+Table_GetPartnerStageInfo = FunctionType
+Table_GetPartnerStory = FunctionType
+Table_GetPartnerStoryInfo = FunctionType
+Table_GetPartnerTrackInfo = FunctionType
+Table_GetPartnerTravelClass = FunctionType
+Table_GetPartnerTravelClassByIndex = FunctionType
+Table_GetPartnerTravelClassBySub = FunctionType
+Table_GetPartnerTravelTaskInfo = FunctionType
+Table_GetPartnerVoice = FunctionType
+Table_GetPartnerVoiceInfo = FunctionType
 Table_GetPath = FunctionType
 Table_GetPendantEffectInfo = FunctionType
 Table_GetPendantEffectListByType = FunctionType
@@ -1527,6 +1578,8 @@ TRADE_MALL_CODE = TableType
 TRADING_RESPOND_CODE = TableType
 tweenlite = TableType
 type = FunctionType
+UI_COIN_SHOP_GOODS_TYPE_OTHER = NumberType
+UI_COIN_SHOP_OTHER_CLASS = TableType
 UI_GetClientPlayerID = FunctionType
 UI_GetCurrentMapID = FunctionType
 UI_GetPlayerMountKungfuID = FunctionType

!src-dist/src/global.zhcn_hd.lua

@@ -1600,7 +1600,6 @@ Table_GetFaceBoneList = FunctionType
 Table_GetFaceBoneV2List = FunctionType
 Table_GetFaceDecalsClass = FunctionType
 Table_GetFaceMeshInfo = FunctionType
-Table_GetFaceStationReportReason = FunctionType
 Table_GetFameInfo = FunctionType
 Table_GetFameInfoByID = FunctionType
 Table_GetFameName = FunctionType
@@ -2204,7 +2203,6 @@ tweenlite = TableType
 type = FunctionType
 TYPE_ID_OF_CAR = NumberType
 UI_BOX_TYPE = TableType
-UI_CHANNEL_POPUP_SETTING_TABLE = TableType
 UI_COIN_SHOP_GOODS_TYPE_OTHER = NumberType
 UI_COIN_SHOP_OTHER_CLASS = TableType
 UI_COINSHOP_GENERAL = TableType
@@ -2300,6 +2298,7 @@ VOICE_ROOM_MIC_MODE = TableType
 VOICE_ROOM_NOTIFY_CODE = TableType
 VOICE_ROOM_TYPE = TableType
 WANTED_MAN_RESULT_CODE = TableType
+WANTED_TYPE_CODE = TableType
 WEAPON_DETAIL = TableType
 WEAPON_EXTERIOR_BOX_INDEX_TYPE = TableType
 WEB_DATA_SIGN_RQST = TableType

.github/workflows/release.yml

@@ -0,0 +1,174 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: '要发布的版本号'
+        required: true
+        default: |
+          0.0.0
+        type: string
+      changelog:
+        description: '更新日志（子插件壹：更新内容|子插件贰：更新内容）'
+        required: true
+        default: '子插件：更新了什么内容'
+        type: string
+
+jobs:
+  prepare-release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout full repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Install pip dependencies
+        run: |
+          pip3 install semver luadata
+
+      - name: Install apt dependencies
+        run: |
+          sudo rm -f /var/lib/man-db/auto-update
+          sudo apt install --no-install-recommends lua5.1 p7zip-full
+
+      - name: Set up Git user
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Switch to stable branch
+        run: |
+          git fetch origin
+          git checkout stable || git checkout -b stable
+
+      - name: Hard reset to master
+        run: |
+          git fetch origin master
+          git reset --hard origin/master
+
+      - name: Check version
+        run: |
+          VERSION="${{ github.event.inputs.version }}"
+          CURRENT_VERSION=$(grep "_VERSION_.*'.*'" Boilerplate_!Base/src/lib/Base.lua | sed -E "s/.*'(.*)'.*/\1/")
+          python3 -c "
+          import semver
+          try:
+            if not semver.compare('$VERSION', '$CURRENT_VERSION') > 0:
+              print('::error::New version $VERSION must be greater than current version $CURRENT_VERSION')
+              exit(1)
+          except ValueError as e:
+            print('::error::Invalid version format. Both versions must be in format X.Y.Z')
+            exit(1)
+          "
+
+      - name: Update Base.lua version and build
+        run: |
+          DATE=$(date +%Y%m%d)
+          VERSION="${{ github.event.inputs.version }}"
+          sed -i "s/local _BUILD_ *=[^']*'[^']*'/local _BUILD_                 = '${DATE}'/" Boilerplate_!Base/src/lib/Base.lua
+          sed -i "s/local _VERSION_ *=[^']*'[^']*'/local _VERSION_               = '${VERSION}'/" Boilerplate_!Base/src/lib/Base.lua
+
+      - name: Update CHANGELOG.md
+        run: |
+          VERSION="${{ github.event.inputs.version }}"
+          CHANGELOG="${{ github.event.inputs.changelog }}"
+          TMPFILE=$(mktemp)
+          echo "# 更新日志" > $TMPFILE
+          echo "" >> $TMPFILE
+          echo "## Boilerplate插件集 v${VERSION}" >> $TMPFILE
+          echo "" >> $TMPFILE
+          echo "$CHANGELOG" | tr '|' '\n' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | sed 's/^["""]//g' | sed 's/["""]$//g' | sed 's/[：:]/] /g' | sed 's/^/* [/g' >> $TMPFILE
+          echo "" >> $TMPFILE
+          tail -n +3 CHANGELOG.md >> $TMPFILE
+          mv $TMPFILE CHANGELOG.md
+
+      - name: Run Publish Command
+        run: |
+          python3 \!src-dist/publish.py
+
+      - name: Push commits
+        run: |
+          git push -f origin stable
+
+  build:
+    needs: prepare-release
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: stable
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Install pip dependencies
+        run: |
+          pip3 install semver luadata
+
+      - name: Install apt dependencies
+        run: |
+          sudo rm -f /var/lib/man-db/auto-update
+          sudo apt install --no-install-recommends lua5.1 p7zip-full
+
+      - name: Write secret to file
+        run: |
+          cat > secret.jx3dat << 'EOF'
+          ${{ secrets.SECRET_JX3DAT }}
+          EOF
+
+      - name: Run Build Command
+        run: |
+          python3 \!src-dist/ci.py
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist-archives-${{ github.run_number }}-${{ github.sha }}
+          path: '\!src-dist/dist/*.7z'
+
+  publish:
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: Production
+      url: ${{ github.server_url }}/${{ github.repository }}/releases/tag/v${{ github.event.inputs.version }}
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: stable
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+
+      - name: Install pip dependencies
+        run: |
+          pip3 install semver
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: dist-archives-${{ github.run_number }}-${{ github.sha }}
+          path: \!src-dist/dist
+
+      - name: Set up Git user
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Run Release Command
+        run: |
+          python3 \!src-dist/release.py