diff --git a/BuildCLI/build_android.sh b/BuildCLI/build_android.sh new file mode 100644 index 00000000..d8ba1391 --- /dev/null +++ b/BuildCLI/build_android.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +cd "$(dirname "$0")" + +source ./path_define.sh + +"${UNITYEDITOR_PATH}/Unity" "${WORKSPACE}" \ + -logFile "${BUILD_LOGFILE}" \ + -executeMethod TEngine.ReleaseTools.AutomationBuildAndroid \ + -quit -batchmode \ + -CustomArgs:Language=en_US "${WORKSPACE}" + +while IFS= read -r line; do + echo "$line" +done < "${BUILD_LOGFILE}" + +echo "按任意键继续..." +read -k1 diff --git a/BuildCLI/path_define.sh b/BuildCLI/path_define.sh new file mode 100644 index 00000000..b812417b --- /dev/null +++ b/BuildCLI/path_define.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +cd "$(dirname "$0")" + +export WORKSPACE="/Users/your_user/github/TEngine/UnityProject" # 请替换为 macOS 上的实际路径 +export UNITYEDITOR_PATH="/Applications/Unity/Hub/Editor/2021.3.20f1c1/Unity.app/Contents/MacOS" # 请替换为 macOS 上的 Unity 路径 +export BUILD_DLL_LOGFILE="./build_dll.log" +export BUILD_LOGFILE="./build.log" + +echo "环境变量已设置：" +echo "WORKSPACE=${WORKSPACE}" +echo "UNITYEDITOR_PATH=${UNITYEDITOR_PATH}" +echo "BUILD_DLL_LOGFILE=${BUILD_DLL_LOGFILE}" +echo "BUILD_LOGFILE=${BUILD_LOGFILE}" diff --git a/Configs/GameConfig/Datas/__beans__.xlsx b/Configs/GameConfig/Datas/__beans__.xlsx index 0af4c6ac..aad60f12 100644 Binary files a/Configs/GameConfig/Datas/__beans__.xlsx and b/Configs/GameConfig/Datas/__beans__.xlsx differ diff --git a/Configs/GameConfig/gen_code_bin_to_project.sh b/Configs/GameConfig/gen_code_bin_to_project.sh new file mode 100644 index 00000000..59269d99 --- /dev/null +++ b/Configs/GameConfig/gen_code_bin_to_project.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +cd "$(dirname "$0")" +echo "当前目录: $(pwd)" + +export WORKSPACE="$(realpath ../../)" +export LUBAN_DLL="${WORKSPACE}/Tools/Luban/Luban.dll" +export CONF_ROOT="$(pwd)" +export DATA_OUTPATH="${WORKSPACE}/UnityProject/Assets/AssetRaw/Configs/bytes/" +export CODE_OUTPATH="${WORKSPACE}/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/" + +cp -R "${CONF_ROOT}/CustomTemplate/ConfigSystem.cs" \ + "${WORKSPACE}/UnityProject/Assets/GameScripts/HotFix/GameProto/ConfigSystem.cs" + +dotnet "${LUBAN_DLL}" \ + -t client \ + -c cs-bin \ + -d bin \ + --conf "${CONF_ROOT}/luban.conf" \ + -x outputCodeDir="${CODE_OUTPATH}" \ + -x outputDataDir="${DATA_OUTPATH}" + +echo "操作完成，按任意键退出..." +read -k1 diff --git a/Configs/GameConfig/gen_code_bin_to_project_lazyload.sh b/Configs/GameConfig/gen_code_bin_to_project_lazyload.sh new file mode 100644 index 00000000..7324d765 --- /dev/null +++ b/Configs/GameConfig/gen_code_bin_to_project_lazyload.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +cd "$(dirname "$0")" +echo "当前目录: $(pwd)" + +export WORKSPACE="$(realpath ../../)" +export LUBAN_DLL="${WORKSPACE}/Tools/Luban/Luban.dll" +export CONF_ROOT="$(pwd)" +export DATA_OUTPATH="${WORKSPACE}/UnityProject/Assets/AssetRaw/Configs/bytes/" +export CODE_OUTPATH="${WORKSPACE}/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/" + +cp -R "${CONF_ROOT}/CustomTemplate/ConfigSystem.cs" \ + "${WORKSPACE}/UnityProject/Assets/GameScripts/HotFix/GameProto/ConfigSystem.cs" + +dotnet "${LUBAN_DLL}" \ + -t client \ + -c cs-bin \ + -d bin \ + --conf "${CONF_ROOT}/luban.conf" \ + --customTemplateDir "${CONF_ROOT}/CustomTemplate/CustomTemplate_Client_LazyLoad" \ + -x outputCodeDir="${CODE_OUTPATH}" \ + -x outputDataDir="${DATA_OUTPATH}" + +echo "操作完成，按任意键退出..." +read -k1 diff --git a/Configs/GameConfig/gen_code_bin_to_server.sh b/Configs/GameConfig/gen_code_bin_to_server.sh new file mode 100644 index 00000000..4b257d38 --- /dev/null +++ b/Configs/GameConfig/gen_code_bin_to_server.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +cd "$(dirname "$0")" +echo "当前目录: $(pwd)" + +export WORKSPACE="$(realpath ../../)" +export LUBAN_DLL="${WORKSPACE}/Tools/Luban/Luban.dll" +export CONF_ROOT="$(pwd)" +export DATA_OUTPATH="${WORKSPACE}/Server/GameConfig" +export CODE_OUTPATH="${WORKSPACE}/Server/Hotfix/Config/GameConfig" + +dotnet "${LUBAN_DLL}" \ + -t server \ + -c cs-bin \ + -d bin \ + --conf "${CONF_ROOT}/luban.conf" \ + -x outputCodeDir="${CODE_OUTPATH}" \ + -x outputDataDir="${DATA_OUTPATH}" + +echo "操作完成，按任意键退出..." +read -k1 diff --git a/README.md b/README.md index ff060fb1..3af596ae 100644 --- a/README.md +++ b/README.md @@ -101,9 +101,6 @@ TEngine #### GameNetty - GameNetty是一套源于ETServer，首次拆分最新的ET8.1的前后端解决方案（包），客户端最精简大约750k，完美做成包的形式，几乎零成本 无侵入的嵌入进你的框架。 -## 交流群 -### 群 号：862987645 - ## Buy me a 奶茶. diff --git a/Tools/FileServer/instal.sh b/Tools/FileServer/instal.sh new file mode 100755 index 00000000..650b59bf --- /dev/null +++ b/Tools/FileServer/instal.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +npm install yumu-static-server -g \ No newline at end of file diff --git a/Tools/FileServer/start.sh b/Tools/FileServer/start.sh new file mode 100755 index 00000000..9e536f9f --- /dev/null +++ b/Tools/FileServer/start.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +server -p 8081 -cors \ No newline at end of file diff --git a/UnityProject/Assets/TEngine/Runtime/Core/GameEvent/EventDispatcher.cs b/UnityProject/Assets/TEngine/Runtime/Core/GameEvent/EventDispatcher.cs index 4ba105e3..04487f92 100644 --- a/UnityProject/Assets/TEngine/Runtime/Core/GameEvent/EventDispatcher.cs +++ b/UnityProject/Assets/TEngine/Runtime/Core/GameEvent/EventDispatcher.cs @@ -13,6 +13,13 @@ namespace TEngine /// private static readonly Dictionary _eventTable = new Dictionary(); + /// + /// 清空事件表。 + /// + internal void ClearEventTable() + { + _eventTable.Clear(); + } #region 事件管理接口 /// diff --git a/UnityProject/Assets/TEngine/Runtime/Core/GameEvent/EventMgr.cs b/UnityProject/Assets/TEngine/Runtime/Core/GameEvent/EventMgr.cs index 941e60bc..5ae3da19 100644 --- a/UnityProject/Assets/TEngine/Runtime/Core/GameEvent/EventMgr.cs +++ b/UnityProject/Assets/TEngine/Runtime/Core/GameEvent/EventMgr.cs @@ -77,7 +77,7 @@ namespace TEngine public void Init() { _eventEntryMap.Clear(); - Dispatcher = new EventDispatcher(); + Dispatcher.ClearEventTable(); } } } \ No newline at end of file diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIModule.cs b/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIModule.cs index 7e38b4a0..530c7525 100644 --- a/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIModule.cs +++ b/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIModule.cs @@ -331,7 +331,7 @@ namespace TEngine float time = 0f; while (!window.IsLoadDone) { - time += Time.time; + time += Time.deltaTime; if (time > 60f) { break; @@ -531,7 +531,7 @@ namespace TEngine float time = 0f; while (!ret.IsLoadDone) { - time += Time.time; + time += Time.deltaTime; if (time > 60f) { break; @@ -569,7 +569,7 @@ namespace TEngine float time = 0f; while (!ret.IsLoadDone) { - time += Time.time; + time += Time.deltaTime; if (time > 60f) { break;