Merge branch 'GroupMountain:main' into main

This commit is contained in:
子沐呀
2024-09-20 22:03:28 +08:00
committed by GitHub
Unverified
7 changed files with 10 additions and 10 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ jobs:
- uses: xmake-io/github-action-setup-xmake@v1 - uses: xmake-io/github-action-setup-xmake@v1
with: with:
xmake-version: branch@master xmake-version: "2.9.3"
- run: | - run: |
xmake repo -u xmake repo -u
+1 -1
View File
@@ -12,7 +12,7 @@ jobs:
- uses: xmake-io/github-action-setup-xmake@v1 - uses: xmake-io/github-action-setup-xmake@v1
with: with:
xmake-version: branch@master xmake-version: "2.9.3"
- run: | - run: |
xmake repo -u xmake repo -u
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"name": "${pluginName}", "name": "${pluginName}",
"entry": "${pluginFile}", "entry": "${pluginFile}",
"version": "0.13.1", "version": "0.13.2",
"author": "GroupMountain", "author": "GroupMountain",
"type": "native", "type": "native",
"passive": true, "passive": true,
+1 -1
View File
@@ -11,7 +11,7 @@ using namespace Mod;
#define LIB_VERSION_MAJOR 0 #define LIB_VERSION_MAJOR 0
#define LIB_VERSION_MINOR 13 #define LIB_VERSION_MINOR 13
#define LIB_VERSION_PATCH 1 #define LIB_VERSION_PATCH 2
#define LIB_VERSION Version(LIB_VERSION_MAJOR, LIB_VERSION_MINOR, LIB_VERSION_PATCH) #define LIB_VERSION Version(LIB_VERSION_MAJOR, LIB_VERSION_MINOR, LIB_VERSION_PATCH)
+2 -2
View File
@@ -38,7 +38,7 @@ void Export_Legacy_GMLib_ServerAPI() {
"GMLib_ServerAPI", "GMLib_ServerAPI",
"spawnEntity", "spawnEntity",
[](std::pair<Vec3, int> pos, std::string const& name) -> Actor* { [](std::pair<Vec3, int> pos, std::string const& name) -> Actor* {
return GMLIB_Spawner::spawnEntity(pos.first, pos.second, name); return GMLIB_Spawner::spawnEntity(pos.first, pos.second, name).as_ptr();
} }
); );
RemoteCall::exportAs( RemoteCall::exportAs(
@@ -46,7 +46,7 @@ void Export_Legacy_GMLib_ServerAPI() {
"shootProjectile", "shootProjectile",
[](Actor* owner, std::string const& name, float speed, float offset) -> Actor* { [](Actor* owner, std::string const& name, float speed, float offset) -> Actor* {
auto ac = (GMLIB_Actor*)owner; auto ac = (GMLIB_Actor*)owner;
return ac->shootProjectile(name, speed, offset); return ac->shootProjectile(name, speed, offset).as_ptr();
} }
); );
RemoteCall::exportAs( RemoteCall::exportAs(
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"format_version": 2, "format_version": 2,
"tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi", "tooth": "github.com/GroupMountain/GMLIB-LegacyRemoteCallApi",
"version": "0.13.1", "version": "0.13.2",
"info": { "info": {
"name": "GMLIB-LegacyRemoteCallApi", "name": "GMLIB-LegacyRemoteCallApi",
"description": "Legacy RemoteCall API for GMLIB", "description": "Legacy RemoteCall API for GMLIB",
@@ -14,7 +14,7 @@
"library" "library"
] ]
}, },
"asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.13.1/GMLIB-LegacyRemoteCallApi-windows-x64.zip", "asset_url": "https://github.com/GroupMountain/GMLIB-LegacyRemoteCallApi/releases/download/v0.13.2/GMLIB-LegacyRemoteCallApi-windows-x64.zip",
"dependencies": { "dependencies": {
"github.com/GroupMountain/GMLIB": ">=0.13.0" "github.com/GroupMountain/GMLIB": ">=0.13.0"
}, },
+2 -2
View File
@@ -8,7 +8,7 @@ if not has_config("vs_runtime") then
end end
-- Option 1: Use the latest version of LeviLamina released on GitHub. -- Option 1: Use the latest version of LeviLamina released on GitHub.
add_requires("levilamina") add_requires("levilaminalibrary")
add_requires("legacyremotecall") add_requires("legacyremotecall")
add_requires("gmlib") add_requires("gmlib")
@@ -59,7 +59,7 @@ target("GMLIB-LegacyRemoteCallApi") -- Change this to your plugin name.
"src" "src"
) )
add_packages( add_packages(
"levilamina", "levilaminalibrary",
"legacyremotecall", "legacyremotecall",
"gmlib" "gmlib"
) )