diff --git a/Assets/Script/Dev/Entry.yue b/Assets/Script/Dev/Entry.yue index 6823e5c0f..324f3b2e6 100644 --- a/Assets/Script/Dev/Entry.yue +++ b/Assets/Script/Dev/Entry.yue @@ -331,14 +331,14 @@ export allClear = -> Director.clearColor = Color 0xff1a1a1a teal.clear! yue.clear! + for _, item in pairs ubox! + node\cleanup! if node = tolua.cast item, "Node" collectgarbage! collectgarbage! setupEventHandlers! Content.searchPaths = searchPaths App.idled = true Wasm\clear! - for _, item in pairs ubox! - node\cleanup! if node = tolua.cast item, "Node" export stop = -> return false if isInEntry diff --git a/Assets/Script/Lib/Dora/en/Opacity.d.tl b/Assets/Script/Lib/Dora/en/Opacity.d.tl index 5647f91ee..36687803f 100644 --- a/Assets/Script/Lib/Dora/en/Opacity.d.tl +++ b/Assets/Script/Lib/Dora/en/Opacity.d.tl @@ -3,8 +3,8 @@ local Ease = require("Ease") -- Creates a definition for an action that animates the opacity of a Node from one value to another. -- @param duration (number) The duration of the animation in seconds. --- @param from (number) The starting opacity value of the Node (0-255). --- @param to (number) The ending opacity value of the Node (0-255). +-- @param from (number) The starting opacity value of the Node (0-1.0). +-- @param to (number) The ending opacity value of the Node (0-1.0). -- @param easing (EaseFunc) [optional] The easing function to use for the animation. Defaults to Ease.Linear if not specified. -- @return (ActionDef) An ActionDef object that can be used to run the animation on a Node. local opacity: function( diff --git a/Assets/Script/Lib/Dora/zh-Hans/Opacity.d.tl b/Assets/Script/Lib/Dora/zh-Hans/Opacity.d.tl index 02dbb9e1d..9544a3583 100644 --- a/Assets/Script/Lib/Dora/zh-Hans/Opacity.d.tl +++ b/Assets/Script/Lib/Dora/zh-Hans/Opacity.d.tl @@ -3,8 +3,8 @@ local Ease = require("Ease") -- 创建一个动作定义,用于将节点的不透明度从一个值变动到另一个值。 -- @param duration (number) 动作持续时间(以秒为单位)。 --- @param from (number) 节点的起始不透明度值(0-255)。 --- @param to (number) 节点的结束不透明度值(0-255)。 +-- @param from (number) 节点的起始不透明度值(0-1.0)。 +-- @param to (number) 节点的结束不透明度值(0-1.0)。 -- @param easing (EaseFunc) [可选] 用于动作的缓动函数。如果未指定,默认为Ease.Linear。 -- @return (ActionDef) 一个动作定义对象,可用于在节点上执行动作。 local opacity: function( diff --git a/Assets/Script/Lib/WebServer.yue b/Assets/Script/Lib/WebServer.yue index bfa027c90..09aa7f2eb 100644 --- a/Assets/Script/Lib/WebServer.yue +++ b/Assets/Script/Lib/WebServer.yue @@ -274,6 +274,9 @@ HttpServer\postSchedule "/signature", (req)-> if signatures = teal.getSignatureAsync luaCodes, targetLine, targetRow, searchPath if signatures = getParamDocs signatures return success: true, :signatures + elseif signatures = teal.getSignatureAsync luaCodes, "builtin.#{targetLine}", targetRow, searchPath + if signatures = getParamDocs signatures + return success: true, :signatures success: false luaKeywords = { diff --git a/Project/Android/app/build.gradle b/Project/Android/app/build.gradle index 5219173ac..c2073febb 100644 --- a/Project/Android/app/build.gradle +++ b/Project/Android/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "org.ippclub.dorothyssr" minSdkVersion 28 targetSdkVersion 32 - versionCode 14 - versionName "1.0.38" + versionCode 15 + versionName "1.0.39" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' externalNativeBuild { cmake { diff --git a/Project/Windows/Dorothy/Resource.rc b/Project/Windows/Dorothy/Resource.rc index 0b48b16ab..395e37b14 100644 --- a/Project/Windows/Dorothy/Resource.rc +++ b/Project/Windows/Dorothy/Resource.rc @@ -61,8 +61,8 @@ IDI_ICON1 ICON "Dorothy SSR.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,38,0 - PRODUCTVERSION 1,0,38,0 + FILEVERSION 1,0,39,0 + PRODUCTVERSION 1,0,39,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -79,12 +79,12 @@ BEGIN BEGIN VALUE "CompanyName", "IppClub" VALUE "FileDescription", "A game engine for rapid game development." - VALUE "FileVersion", "1.0.38.0" + VALUE "FileVersion", "1.0.39.0" VALUE "InternalName", "Dorothy.exe" VALUE "LegalCopyright", "Copyright (C) 2023" VALUE "OriginalFilename", "Dorothy.exe" VALUE "ProductName", "Dorothy SSR" - VALUE "ProductVersion", "1.0.38.0" + VALUE "ProductVersion", "1.0.39.0" END END BLOCK "VarFileInfo" diff --git a/Project/iOS/Dorothy/Info.plist b/Project/iOS/Dorothy/Info.plist index c2227beb5..5c33bbea4 100644 --- a/Project/iOS/Dorothy/Info.plist +++ b/Project/iOS/Dorothy/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.38 + 1.0.39 CFBundleSignature ???? CFBundleVersion - 14 + 15 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/Project/macOS/Dorothy/Info.plist b/Project/macOS/Dorothy/Info.plist index 0e5f19e75..827428281 100644 --- a/Project/macOS/Dorothy/Info.plist +++ b/Project/macOS/Dorothy/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.38 + 1.0.39 CFBundleSignature ???? CFBundleVersion - 14 + 15 LSApplicationCategoryType public.app-category.developer-tools LSMinimumSystemVersion diff --git a/Source/Basic/Application.cpp b/Source/Basic/Application.cpp index a29d39a7a..28cf59300 100644 --- a/Source/Basic/Application.cpp +++ b/Source/Basic/Application.cpp @@ -25,7 +25,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI #include #include -#define DORA_VERSION "1.0.38"_slice +#define DORA_VERSION "1.0.39"_slice #if BX_PLATFORM_ANDROID #include