diff --git a/Yosin_Engine.exe b/Yosin_Engine.exe index 8cadcda..30d9280 100644 Binary files a/Yosin_Engine.exe and b/Yosin_Engine.exe differ diff --git a/sqr/.vscode/launch.json b/sqr/.vscode/launch.json new file mode 100644 index 0000000..3dbb121 --- /dev/null +++ b/sqr/.vscode/launch.json @@ -0,0 +1,20 @@ +{ + // 使用 IntelliSense 了解相关属性。 + // 悬停以查看现有属性的描述。 + // 欲了解更多信息,请访问: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "squirrel", + "request": "attach", + "name": "Server", + "port": 2222 + }, + { + "type": "squirrel", + "request": "attach", + "name": "Client", + "port": 2222 + } + ] +} \ No newline at end of file diff --git a/sqr/Core/ENUM/ENUM_SYSTEM.nut b/sqr/Core/ENUM/ENUM_SYSTEM.nut index 226b3a5..eee42ca 100644 --- a/sqr/Core/ENUM/ENUM_SYSTEM.nut +++ b/sqr/Core/ENUM/ENUM_SYSTEM.nut @@ -6,7 +6,6 @@ */ _DEBUG_ <- true; - enum MouseButton { Left ///< 鼠标左键 Right ///< 鼠标右键 diff --git a/sqr/SquirrelFileConfig.cfg b/sqr/SquirrelFileConfig.cfg index 337fcef..f3492fe 100644 --- a/sqr/SquirrelFileConfig.cfg +++ b/sqr/SquirrelFileConfig.cfg @@ -1,77 +1,79 @@ -sqr/Core/ENUM/ENUM_KEY.nut -sqr/Core/ENUM/enum_system.nut -sqr/Core/BaseTool/BaseTool.nut -sqr/Core/BaseTool/Math.nut -sqr/Core/BaseTool/String.nut -sqr/Core/BaseTool/BlobExClass.nut -sqr/Core/BaseTool/JsonClass/JsonClass.nut -sqr/Core/BaseTool/JsonClass/Json.nut -sqr/Core/BaseClass/ScriptManager/ScriptManager.nut -sqr/Core/BaseClass/ScriptManager/InitAni.nut -sqr/Core/BaseClass/Game_Window_Class.nut -sqr/Core/BaseClass/BaseObject.nut -sqr/Core/BaseClass/AudioClass.nut -sqr/Core/BaseClass/StageClass.nut -sqr/Core/BaseClass/ActorObject.nut -sqr/Core/BaseClass/LayerObject.nut -sqr/Core/BaseClass/UserStorage.nut -sqr/Core/BaseClass/SpriteObject/SpriteFrameClass.nut -sqr/Core/BaseClass/SpriteObject/SpriteClass.nut -sqr/Core/BaseClass/TextObject/Font.nut -sqr/Core/BaseClass/TextObject/TextActor.nut -sqr/Core/BaseClass/AnimationClass/AnimationClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\ENUM\ENUM_KEY.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\ENUM\enum_system.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseTool\BaseTool.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseTool\Math.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseTool\String.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseTool\BlobExClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseTool\JsonClass\JsonClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseTool\JsonClass\Json.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ScriptManager\ScriptManager.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ScriptManager\InitAni.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\Game_Window_Class.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\BaseObject.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\AudioClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\StageClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\ActorObject.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\LayerObject.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\UserStorage.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\SpriteObject\SpriteFrameClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\SpriteObject\SpriteClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\TextObject\Font.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\TextObject\TextActor.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\BaseClass\AnimationClass\AnimationClass.nut -sqr/Core/ExtraCalss/Socket/Socket.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\ExtraCalss\Socket\Socket.nut -sqr/Core/Game_Proc/Game_Proc.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\Game_Proc\Game_Proc.nut -sqr/Core/UI_Class/UI_Cursor.nut -sqr/Core/UI_Class/UI_Core.nut -sqr/Core/UI_Class/UI_Widget.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\UI_Class\UI_Cursor.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\UI_Class\UI_Core.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\Core\UI_Class\UI_Widget.nut -sqr/User/_ENUM/enum_packet.nut -sqr/User/_ENUM/enum_game.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\_ENUM\global_object.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\_ENUM\enum_music.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\_ENUM\enum_packet.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\_ENUM\enum_game.nut -sqr/User/Socket/Socket.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Socket\Socket.nut -sqr/User/Asset/AssetManager.nut -sqr/User/Asset/FontAsset.nut -sqr/User/Asset/Character/Animation.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Asset\AssetManager.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Asset\FontAsset.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Asset\Character\Animation.nut -sqr/User/Asset/Item/Item.nut -sqr/User/Asset/Item/Equipment.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Asset\Item\Item.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Asset\Item\Equipment.nut -sqr/User/Object/StateMachine/StateMachineClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\StateMachine\StateMachineClass.nut -sqr/User/Object/Object/BaseObject.nut -sqr/User/Object/Object/AnimationObject.nut -sqr/User/Object/Map/TileObject.nut -sqr/User/Object/Map/MapObject.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\Object\BaseObject.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\Object\AnimationObject.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\Map\TileObject.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\Map\MapObject.nut -sqr/User/Object/ActiveObject/GameObjectClass.nut -sqr/User/Object/ActiveObject/StaticObjectClass.nut -sqr/User/Object/ActiveObject/ActiveObjectClass.nut -sqr/User/Object/ActiveObject/PassiveObjectClass.nut -sqr/User/Object/ActiveObject/MonsterObjectClass.nut -sqr/User/Object/ActiveObject/CharacterObjectClass.nut -sqr/User/Object/ActiveObject/CharacterObjectClass_AI.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\GameObjectClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\StaticObjectClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\ActiveObjectClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\PassiveObjectClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\MonsterObjectClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\CharacterObjectClass.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Object\ActiveObject\CharacterObjectClass_AI.nut -sqr/User/Socket/Socket.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Socket\Socket.nut -sqr/User/Stage/LodingStage.nut -sqr/User/Stage/TestStage.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Stage\LodingStage.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\Stage\TestStage.nut -sqr/User/UI/Widget/IMouse.nut -sqr/User/UI/Widget/InputBox.nut -sqr/User/UI/Widget/Drag_Button.nut -sqr/User/UI/Widget/Scroll_Bar.nut -sqr/User/UI/Widget/Text_Button.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Widget\IMouse.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Widget\InputBox.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Widget\Drag_Button.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Widget\Scroll_Bar.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Widget\Text_Button.nut -sqr/User/UI/Window/0_Login.nut -sqr/User/UI/Window/1_Select_Character.nut -sqr/User/UI/Window/2_create_Character.nut -sqr/User/UI/Window/233_HUD_Message.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Window\0_Login.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Window\1_Select_Character.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Window\2_create_Character.nut +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\UI\Window\233_HUD_Message.nut -sqr/User/main.nut \ No newline at end of file +l:\Yosin_Engine\Yosin&Kiwano_DOF\sqr\User\main.nut \ No newline at end of file diff --git a/sqr/folder-alias.json b/sqr/folder-alias.json index cab437c..22d67e3 100644 --- a/sqr/folder-alias.json +++ b/sqr/folder-alias.json @@ -187,5 +187,11 @@ }, "User/_ENUM/enum_packet.nut": { "description": "包枚举" + }, + "User/_ENUM/global_object.nut": { + "description": "全局对象表" + }, + "User/_ENUM/enum_music.nut": { + "description": "音乐枚举" } } \ No newline at end of file