Merge branch 'main' into ci-autotest

This commit is contained in:
Trebor Huang
2021-10-31 23:51:40 +08:00
committed by GitHub
7 changed files with 15 additions and 4 deletions

View File

@@ -40,6 +40,9 @@ inputs:
FASTLANE_DISCORD_WEBHOOK: FASTLANE_DISCORD_WEBHOOK:
required: true required: true
description: "Fastlane Discord webhook" description: "Fastlane Discord webhook"
FASTLANE_ACTION_ID:
required: true
description: "Fastlane Action ID"
FASTLANE_MATCH_PWD: FASTLANE_MATCH_PWD:
required: true required: true
description: "Fastlane Match description password" description: "Fastlane Match description password"
@@ -71,6 +74,7 @@ runs:
lane: '${{ inputs.type }}' lane: '${{ inputs.type }}'
subdirectory: 'Techmino-iOS/platform/xcode' subdirectory: 'Techmino-iOS/platform/xcode'
env: env:
ACTION_ID: '${{ inputs.FASTLANE_ACTION_ID }}'
API_ID: '${{ inputs.APPLE_API_ID }}' API_ID: '${{ inputs.APPLE_API_ID }}'
API_ISSUER: '${{ inputs.APPLE_API_ISSUER }}' API_ISSUER: '${{ inputs.APPLE_API_ISSUER }}'
API_KEY: '${{ inputs.APPLE_API_KEY }}' API_KEY: '${{ inputs.APPLE_API_KEY }}'

View File

@@ -144,6 +144,7 @@ jobs:
APPLE_APP_PROFILE: '${{ secrets.APPLE_APP_PROFILE }}' APPLE_APP_PROFILE: '${{ secrets.APPLE_APP_PROFILE }}'
APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}' APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}'
APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}' APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}'
FASTLANE_ACTION_ID: '${{ github.run_id }}'
FASTLANE_DISCORD_WEBHOOK: '${{ secrets.FASTLANE_DISCORD_WEBHOOK }}' FASTLANE_DISCORD_WEBHOOK: '${{ secrets.FASTLANE_DISCORD_WEBHOOK }}'
FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}' FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}'
FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}' FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}'

View File

@@ -196,6 +196,7 @@ jobs:
APPLE_APP_PROFILE: '${{ secrets.APPLE_APP_PROFILE }}' APPLE_APP_PROFILE: '${{ secrets.APPLE_APP_PROFILE }}'
APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}' APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}'
APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}' APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}'
FASTLANE_ACTION_ID: '${{ github.run_id }}'
FASTLANE_DISCORD_WEBHOOK: '${{ secrets.FASTLANE_DISCORD_WEBHOOK }}' FASTLANE_DISCORD_WEBHOOK: '${{ secrets.FASTLANE_DISCORD_WEBHOOK }}'
FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}' FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}'
FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}' FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}'

View File

@@ -138,6 +138,7 @@ jobs:
APPLE_APP_PROFILE: '${{ secrets.APPLE_APP_PROFILE }}' APPLE_APP_PROFILE: '${{ secrets.APPLE_APP_PROFILE }}'
APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}' APPLE_KEYCHAIN_NAME: '${{ secrets.APPLE_KEYCHAIN_NAME }}'
APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}' APPLE_KEYCHAIN_PWD: '${{ secrets.APPLE_KEYCHAIN_PWD }}'
FASTLANE_ACTION_ID: '${{ github.run_id }}'
FASTLANE_DISCORD_WEBHOOK: '${{ secrets.FASTLANE_DISCORD_WEBHOOK }}' FASTLANE_DISCORD_WEBHOOK: '${{ secrets.FASTLANE_DISCORD_WEBHOOK }}'
FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}' FASTLANE_MATCH_PWD: '${{ secrets.FASTLANE_MATCH_PWD }}'
FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}' FASTLANE_MATCH_TOKEN: '${{ secrets.FASTLANE_MATCH_TOKEN }}'

View File

@@ -382,8 +382,11 @@ end
for _,v in next,fs.getDirectoryItems('parts/modes')do for _,v in next,fs.getDirectoryItems('parts/modes')do
if isSafeFile('parts/modes/'..v)and not MODES[v:sub(1,-5)]then if isSafeFile('parts/modes/'..v)and not MODES[v:sub(1,-5)]then
local M={name=v:sub(1,-5)} local M={name=v:sub(1,-5)}
TABLE.complete(require('parts.modes.'..M.name),M) local modeData=require('parts.modes.'..M.name)
MODES[M.name]=M if modeData.env then
TABLE.complete(modeData,M)
MODES[M.name]=M
end
end end
end end

View File

@@ -33,7 +33,7 @@ return[=[
计算器可以弹琴了 计算器可以弹琴了
词典添加一些词条 词典添加一些词条
控制台可以查看日志 控制台可以查看日志
暂时取消导入存档的版本限制(过早存档请不要导入!前两三个版本的不会有问题) 暂时取消导入存档的版本限制(过早存档请不要导入!只能保证近两三个版本一定能用)
修改TRS的JL踢墙表的0-R和R-0最后几项(可能会导致部分录像无法正常播放) 修改TRS的JL踢墙表的0-R和R-0最后几项(可能会导致部分录像无法正常播放)
代码: 代码:
SFX模块大升级,支持播放乐器采样 SFX模块大升级,支持播放乐器采样
@@ -43,6 +43,7 @@ return[=[
生成AI玩家时没刷新20G开关 生成AI玩家时没刷新20G开关
小程序uttt和calc的问题 小程序uttt和calc的问题
"就这"语言的词典是英文 "就这"语言的词典是英文
游戏场景ui微调
miku语音小修正 miku语音小修正
0.16.2: 曲率引擎 Warp drive 0.16.2: 曲率引擎 Warp drive

View File

@@ -1,5 +1,5 @@
return{ return{
["apkCode"]=387, ["apkCode"]=388,
["code"]=1603, ["code"]=1603,
["string"]="V0.16.3@DEV", ["string"]="V0.16.3@DEV",
["room"]="ver A-0", ["room"]="ver A-0",