[Invaders] Minor fixes after update to release/0.1.0 & add gitignore file
This commit is contained in:
Родитель
687cb65dc0
Коммит
fc239bcff7
|
@ -0,0 +1,63 @@
|
|||
# This .gitignore file should be placed at the root of your Unity project directory
|
||||
#
|
||||
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
|
||||
#
|
||||
/[Ll]ibrary/
|
||||
/[Tt]emp/
|
||||
/[Oo]bj/
|
||||
/[Bb]uild/
|
||||
/[Bb]uilds/
|
||||
/[Ll]ogs/
|
||||
/[Mm]emoryCaptures/
|
||||
|
||||
# Never ignore Asset meta data
|
||||
!/[Aa]ssets/**/*.meta
|
||||
|
||||
# Uncomment this line if you wish to ignore the asset store tools plugin
|
||||
# /[Aa]ssets/AssetStoreTools*
|
||||
|
||||
# TextMesh Pro files
|
||||
[Aa]ssets/TextMesh*Pro/
|
||||
|
||||
# Autogenerated Jetbrains Rider plugin
|
||||
[Aa]ssets/Plugins/Editor/JetBrains*
|
||||
|
||||
# Visual Studio cache directory
|
||||
.vs/
|
||||
|
||||
# Gradle cache directory
|
||||
.gradle/
|
||||
|
||||
# Autogenerated VS/MD/Consulo solution and project files
|
||||
ExportedObj/
|
||||
.consulo/
|
||||
*.csproj
|
||||
*.unityproj
|
||||
*.sln
|
||||
*.suo
|
||||
*.tmp
|
||||
*.user
|
||||
*.userprefs
|
||||
*.pidb
|
||||
*.booproj
|
||||
*.svd
|
||||
*.pdb
|
||||
*.mdb
|
||||
*.opendb
|
||||
*.VC.db
|
||||
|
||||
# Unity3D generated meta files
|
||||
*.pidb.meta
|
||||
*.pdb.meta
|
||||
*.mdb.meta
|
||||
|
||||
# Unity3D generated file on crash reports
|
||||
sysinfo.txt
|
||||
|
||||
# Builds
|
||||
*.apk
|
||||
*.unitypackage
|
||||
|
||||
# Crashlytics generated file
|
||||
crashlytics-build.properties
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Rider ignored files
|
||||
/contentModel.xml
|
||||
/projectSettingsUpdater.xml
|
||||
/.idea.Invaders.iml
|
||||
/modules.xml
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
|
||||
</project>
|
|
@ -0,0 +1,26 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ContentModelUserStore">
|
||||
<attachedFolders />
|
||||
<explicitIncludes>
|
||||
<Path>Library/PackageCache/com.unity.ext.nunit@1.0.6</Path>
|
||||
<Path>Library/PackageCache/com.unity.ide.rider@2.0.7</Path>
|
||||
<Path>Library/PackageCache/com.unity.ide.visualstudio@2.0.7</Path>
|
||||
<Path>Library/PackageCache/com.unity.ide.vscode@1.2.3</Path>
|
||||
<Path>Library/PackageCache/com.unity.multiplayer.mlapi@f0ed667b78</Path>
|
||||
<Path>Library/PackageCache/com.unity.nuget.mono-cecil@1.10.1-preview.1</Path>
|
||||
<Path>Library/PackageCache/com.unity.test-framework@1.1.22</Path>
|
||||
<Path>Library/PackageCache/com.unity.textmeshpro@3.0.3</Path>
|
||||
<Path>Library/PackageCache/com.unity.timeline@1.4.6</Path>
|
||||
<Path>Packages</Path>
|
||||
<Path>ProjectSettings</Path>
|
||||
</explicitIncludes>
|
||||
<explicitExcludes>
|
||||
<Path>.idea</Path>
|
||||
<Path>Logs</Path>
|
||||
<Path>Temp</Path>
|
||||
<Path>UserSettings</Path>
|
||||
<Path>obj</Path>
|
||||
</explicitExcludes>
|
||||
</component>
|
||||
</project>
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="RIDER_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$/../.." />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
|
||||
</component>
|
||||
</project>
|
|
@ -15,7 +15,7 @@ public class MenuControl : MonoBehaviour
|
|||
public void StartLocalGame()
|
||||
{
|
||||
// Update the current HostNameInput with whatever we have set in the NetworkConfig as default
|
||||
var unetTransport = (UnetTransport)NetworkManager.Singleton.NetworkConfig.NetworkTransport;
|
||||
var unetTransport = (UNetTransport)NetworkManager.Singleton.NetworkConfig.NetworkTransport;
|
||||
if (unetTransport) m_HostIpInput.text = unetTransport.ConnectAddress;
|
||||
LobbyControl.isHosting = true; //This is a work around to handle proper instantiation of a scene for the first time.(See LobbyControl.cs)
|
||||
SceneTransitionHandler.sceneTransitionHandler.SwitchScene(m_LobbySceneName);
|
||||
|
@ -25,7 +25,7 @@ public class MenuControl : MonoBehaviour
|
|||
{
|
||||
if (m_HostIpInput.text != "Hostname")
|
||||
{
|
||||
var unetTransport = (UnetTransport)NetworkManager.Singleton.NetworkConfig.NetworkTransport;
|
||||
var unetTransport = (UNetTransport)NetworkManager.Singleton.NetworkConfig.NetworkTransport;
|
||||
if (unetTransport) unetTransport.ConnectAddress = m_HostIpInput.text;
|
||||
LobbyControl.isHosting = false; //This is a work around to handle proper instantiation of a scene for the first time. (See LobbyControl.cs)
|
||||
SceneTransitionHandler.sceneTransitionHandler.SwitchScene(m_LobbySceneName);
|
||||
|
|
|
@ -33,13 +33,13 @@
|
|||
"url": "https://packages.unity.com"
|
||||
},
|
||||
"com.unity.multiplayer.mlapi": {
|
||||
"version": "https://github.com/Unity-Technologies/com.unity.multiplayer.mlapi.git?path=/com.unity.multiplayer.mlapi#develop",
|
||||
"version": "https://github.com/Unity-Technologies/com.unity.multiplayer.mlapi.git?path=/com.unity.multiplayer.mlapi#release/0.1.0",
|
||||
"depth": 0,
|
||||
"source": "git",
|
||||
"dependencies": {
|
||||
"com.unity.nuget.mono-cecil": "1.10.1-preview.1"
|
||||
},
|
||||
"hash": "d0b9dfc8bf3333716a51bc81c83b77337b264d5e"
|
||||
"hash": "f0ed667b78e7f94a3e7006591a5f85e590bfdfe6"
|
||||
},
|
||||
"com.unity.nuget.mono-cecil": {
|
||||
"version": "1.10.1-preview.1",
|
||||
|
@ -89,13 +89,6 @@
|
|||
"com.unity.modules.imgui": "1.0.0"
|
||||
}
|
||||
},
|
||||
"com.veriorpies.parrelsync": {
|
||||
"version": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync",
|
||||
"depth": 0,
|
||||
"source": "git",
|
||||
"dependencies": {},
|
||||
"hash": "efac099e5a7a373b6ea961cc0b8aaebe059ab1c8"
|
||||
},
|
||||
"com.unity.modules.ai": {
|
||||
"version": "1.0.0",
|
||||
"depth": 0,
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!162 &1
|
||||
EditorUserSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 4
|
||||
m_ConfigSettings:
|
||||
RecentlyUsedScenePath-0:
|
||||
value: 22424703114646680e0b0227036c761e1f033a25233c15243f280d7df7ee3d2cfb
|
||||
flags: 0
|
||||
vcSharedLogLevel:
|
||||
value: 0d5e400f0650
|
||||
flags: 0
|
||||
m_VCAutomaticAdd: 1
|
||||
m_VCDebugCom: 0
|
||||
m_VCDebugCmd: 0
|
||||
m_VCDebugOut: 0
|
||||
m_SemanticMergeMode: 2
|
||||
m_VCShowFailedCheckout: 1
|
||||
m_VCOverwriteFailedCheckoutAssets: 1
|
||||
m_VCProjectOverlayIcons: 1
|
||||
m_VCHierarchyOverlayIcons: 1
|
||||
m_VCOtherOverlayIcons: 1
|
||||
m_VCAllowAsyncUpdate: 1
|
Загрузка…
Ссылка в новой задаче