From 961a4c431d7ff82f5b5679d7ef1401103eb6f046 Mon Sep 17 00:00:00 2001 From: li Date: Mon, 31 May 2021 19:02:50 +0800 Subject: [PATCH 1/2] change some config --- Assets/Resources/BillingMode.json | 1 + .../BillingMode.json.meta} | 5 +- Assets/Scripts/Game/Entity/GameWorld.cs | 1 - Assets/Scripts/Game/Util.meta | 8 - Assets/XLua.meta | 8 - Lua/Game/Login/LoginController.lua | 2 +- Packages/manifest.json | 20 +- Packages/packages-lock.json | 492 ++++++++++++++++++ ProjectSettings/PackageManagerSettings.asset | 38 ++ ProjectSettings/ProjectVersion.txt | 4 +- 10 files changed, 546 insertions(+), 33 deletions(-) create mode 100644 Assets/Resources/BillingMode.json rename Assets/{EntityCache/Resources.meta => Resources/BillingMode.json.meta} (57%) delete mode 100644 Assets/Scripts/Game/Util.meta delete mode 100644 Assets/XLua.meta create mode 100644 Packages/packages-lock.json create mode 100644 ProjectSettings/PackageManagerSettings.asset diff --git a/Assets/Resources/BillingMode.json b/Assets/Resources/BillingMode.json new file mode 100644 index 00000000..6f4bfb71 --- /dev/null +++ b/Assets/Resources/BillingMode.json @@ -0,0 +1 @@ +{"androidStore":"GooglePlay"} \ No newline at end of file diff --git a/Assets/EntityCache/Resources.meta b/Assets/Resources/BillingMode.json.meta similarity index 57% rename from Assets/EntityCache/Resources.meta rename to Assets/Resources/BillingMode.json.meta index 6500e4dd..b8083481 100644 --- a/Assets/EntityCache/Resources.meta +++ b/Assets/Resources/BillingMode.json.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 0c331859e05eb474ea6f9cabc0055703 -folderAsset: yes -DefaultImporter: +guid: 38bce955dae11db4abcb637723b7f2f5 +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Scripts/Game/Entity/GameWorld.cs b/Assets/Scripts/Game/Entity/GameWorld.cs index 2f100988..0961d44d 100644 --- a/Assets/Scripts/Game/Entity/GameWorld.cs +++ b/Assets/Scripts/Game/Entity/GameWorld.cs @@ -50,7 +50,6 @@ public struct DespawningEntity : IComponentData { } - [InternalBufferCapacity(16)] public struct EntityGroupChildren : IBufferElementData { diff --git a/Assets/Scripts/Game/Util.meta b/Assets/Scripts/Game/Util.meta deleted file mode 100644 index 6257ff32..00000000 --- a/Assets/Scripts/Game/Util.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0de087dea215a74408760a63bf6a2153 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/XLua.meta b/Assets/XLua.meta deleted file mode 100644 index d9972532..00000000 --- a/Assets/XLua.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5db4fa5d72cd39b47bdc20f27b3e6843 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Lua/Game/Login/LoginController.lua b/Lua/Game/Login/LoginController.lua index 718b36a0..26121e04 100644 --- a/Lua/Game/Login/LoginController.lua +++ b/Lua/Game/Login/LoginController.lua @@ -160,7 +160,7 @@ function LoginController:OnReceiveLine(bytes) end function LoginController:Connect() - -- print('Cat:LoginController.lua[Connect] self.login_state : ', self.login_state) + print('Cat:LoginController.lua[Connect] self.login_state : ', self.login_state) if self.login_state == LoginConst.Status.WaitForGameServerConnect then --刚连接上游戏服务器时需要进行一次握手校验 local handshake = string.format("%s@%s#%s:%d", crypt.base64encode(self.token.user), crypt.base64encode(self.token.server),crypt.base64encode(self.subid) , 1) diff --git a/Packages/manifest.json b/Packages/manifest.json index ee3e2aa4..05721d36 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,8 +2,8 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.addressables": "1.1.10", - "com.unity.ads": "2.0.8", + "com.unity.addressables": "1.16.16", + "com.unity.ads": "3.6.1", "com.unity.analytics": "3.3.5", "com.unity.assetbundlebrowser": "1.7.0", "com.unity.burst": "1.2.0", @@ -11,17 +11,17 @@ "com.unity.collab-proxy": "1.2.16", "com.unity.collections": "0.1.1-preview", "com.unity.entities": "0.1.1-preview", - "com.unity.ext.nunit": "1.0.0", + "com.unity.ext.nunit": "1.0.6", "com.unity.ide.rider": "1.1.4", - "com.unity.ide.vscode": "1.1.4", - "com.unity.mathematics": "1.1.0", - "com.unity.multiplayer-hlapi": "1.0.4", - "com.unity.purchasing": "2.0.6", - "com.unity.test-framework": "1.1.11", + "com.unity.ide.vscode": "1.2.3", + "com.unity.mathematics": "1.2.1", + "com.unity.multiplayer-hlapi": "1.0.8", + "com.unity.purchasing": "3.0.1", + "com.unity.test-framework": "1.1.22", "com.unity.textmeshpro": "2.0.1", - "com.unity.timeline": "1.2.10", + "com.unity.timeline": "1.2.18", "com.unity.ugui": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.0.2", + "com.unity.xr.legacyinputhelpers": "2.1.7", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json new file mode 100644 index 00000000..f0cf5ddf --- /dev/null +++ b/Packages/packages-lock.json @@ -0,0 +1,492 @@ +{ + "dependencies": { + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.2d.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.addressables": { + "version": "1.16.16", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.scriptablebuildpipeline": "1.15.2", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ads": { + "version": "3.6.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.analytics": { + "version": "3.3.5", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.assetbundlebrowser": { + "version": "1.7.0", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.burst": { + "version": "1.2.0", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.1.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.cinemachine": { + "version": "2.3.4", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "1.2.16", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.collections": { + "version": "0.1.1-preview", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework.performance": "1.0.9-preview", + "com.unity.burst": "1.1.2" + }, + "url": "https://packages.unity.com" + }, + "com.unity.entities": { + "version": "0.1.1-preview", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.properties": "0.6.2-preview", + "com.unity.mathematics": "1.1.0", + "com.unity.test-framework.performance": "1.0.9-preview", + "com.unity.burst": "1.1.2", + "nuget.mono-cecil": "0.1.6-preview", + "com.unity.jobs": "0.1.1-preview", + "com.unity.collections": "0.1.1-preview" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.6", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.rider": { + "version": "1.1.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.vscode": { + "version": "1.2.3", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.jobs": { + "version": "0.1.1-preview", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.collections": "0.1.1-preview", + "com.unity.mathematics": "1.1.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.mathematics": { + "version": "1.2.1", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.multiplayer-hlapi": { + "version": "1.0.8", + "depth": 0, + "source": "registry", + "dependencies": { + "nuget.mono-cecil": "0.1.6-preview" + }, + "url": "https://packages.unity.com" + }, + "com.unity.properties": { + "version": "0.6.2-preview", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.collections": "0.0.9-preview.16", + "com.unity.test-framework.performance": "1.0.6-preview" + }, + "url": "https://packages.unity.com" + }, + "com.unity.purchasing": { + "version": "3.0.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.androidjni": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.scriptablebuildpipeline": { + "version": "1.15.2", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.1.22", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework.performance": { + "version": "1.2.3-preview", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.0.13", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.vr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "2.0.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.2.18", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.xr.legacyinputhelpers": { + "version": "2.1.7", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "nuget.mono-cecil": { + "version": "0.1.6-preview", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 00000000..6920e3ad --- /dev/null +++ b/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,38 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_ScopedRegistriesSettingsExpanded: 1 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_ErrorMessage: + m_Original: + m_Id: + m_Name: + m_Url: + m_Scopes: [] + m_IsDefault: 0 + m_Modified: 0 + m_Name: + m_Url: + m_Scopes: + - + m_SelectedScopeIndex: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 68562fcc..17e96079 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.3.2f1 -m_EditorVersionWithRevision: 2019.3.2f1 (536936b73d1b) +m_EditorVersion: 2019.4.23f1c1 +m_EditorVersionWithRevision: 2019.4.23f1c1 (796c50341b7f) From 50f868b28ffe9375f0f1bcd96bb79e1a722095eb Mon Sep 17 00:00:00 2001 From: li Date: Tue, 1 Jun 2021 17:58:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E2=80=98message=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lua/Common/util/sprotoloader.lua | 4 ++-- Server/run.sh | 0 Server/service/main.lua | 10 +++++----- Server/service/msgagent.lua | 4 ++-- Server/stop.sh | 0 5 files changed, 9 insertions(+), 9 deletions(-) mode change 100644 => 100755 Server/run.sh mode change 100644 => 100755 Server/stop.sh diff --git a/Lua/Common/util/sprotoloader.lua b/Lua/Common/util/sprotoloader.lua index e38604c7..94beb189 100644 --- a/Lua/Common/util/sprotoloader.lua +++ b/Lua/Common/util/sprotoloader.lua @@ -1,6 +1,6 @@ -local parser = require "Common.Util.sprotoparser" +local parser = require "Common.util.sprotoparser" local core = require "sproto.core" -local sproto = require "Common.Util.sproto" +local sproto = require "Common.util.sproto" local loader = {} diff --git a/Server/run.sh b/Server/run.sh old mode 100644 new mode 100755 diff --git a/Server/service/main.lua b/Server/service/main.lua index 846e6031..a4991137 100644 --- a/Server/service/main.lua +++ b/Server/service/main.lua @@ -4,17 +4,17 @@ require "common.util" skynet.start(function() skynet.error("Server start") skynet.uniqueservice("protoloader") - if not skynet.getenv "daemon" then - local console = skynet.newservice("console") - end - skynet.newservice("debug_console",8000) + --if not skynet.getenv "daemon" then + -- local console = skynet.newservice("console") + --end + --skynet.newservice("debug_console",8000) local loginserver = skynet.newservice("logind") local platform_id = 1 local server_id = 1 local gate = skynet.newservice("gated", loginserver, platform_id, server_id) skynet.call(gate, "lua", "open" , { - port = 8888, + port = 8000, maxclient = 512, servername = "DevelopServer", }) diff --git a/Server/service/msgagent.lua b/Server/service/msgagent.lua index 527f116b..ebece60f 100644 --- a/Server/service/msgagent.lua +++ b/Server/service/msgagent.lua @@ -1,6 +1,6 @@ local skynet = require "skynet" -local sproto = require "Common.Util.sproto" -local sprotoloader = require "Common.Util.sprotoloader" +local sproto = require "Common.util.sproto" +local sprotoloader = require "Common.util.sprotoloader" local print_r = require "Common.Util.print_r" require "common.util" ErrorCode = require "game.config.ErrorCode" diff --git a/Server/stop.sh b/Server/stop.sh old mode 100644 new mode 100755