some settings from the video recordings
This commit is contained in:
@@ -1 +0,0 @@
|
||||
{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"MultiThreaded","MtRendering":false,"GraphicsJobs":false,"GpuSkinning":true,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"Android","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.3.5f1","Branch":"6000.3/staging","Changeset":"a1ec4b2f2d19","Date":1768317069},"Dependencies":["com.unity.2d.enhancers@1.0.0","com.unity.addressables@2.8.0","com.unity.ai.inference@2.4.1","com.unity.ai.navigation@2.0.9","com.unity.cloud.gltfast@6.15.1","com.unity.collab-proxy@2.11.2","com.unity.device-simulator.devices@1.0.1","com.unity.ide.rider@3.0.38","com.unity.ide.visualstudio@2.0.26","com.unity.inputsystem@1.17.0","com.unity.multiplayer.center@1.0.1","com.unity.probuilder@6.0.8","com.unity.render-pipelines.universal@17.3.0","com.unity.sdk.linux-x86_64@1.0.2","com.unity.test-framework@1.6.0","com.unity.timeline@1.8.10","com.unity.toolchain.linux-x86_64-linux@1.0.2","com.unity.ugui@2.0.0","com.unity.visualscripting@1.9.9","com.unity.xr.arfoundation@6.3.2","com.unity.xr.compositionlayers@2.3.0","com.unity.xr.hands@1.7.2","com.unity.xr.interaction.toolkit@3.3.1","com.unity.xr.openxr@1.16.1","com.unity.modules.accessibility@1.0.0","com.unity.modules.adaptiveperformance@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vectorgraphics@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.xr.core-utils@2.5.3","com.unity.xr.management@4.5.3","com.unity.xr.legacyinputhelpers@2.1.13","com.unity.mathematics@1.3.3","com.unity.editorcoroutines@1.0.1","com.unity.sysroot.base@1.0.2","com.unity.ext.nunit@2.0.5","com.unity.render-pipelines.core@17.3.0","com.unity.shadergraph@17.3.0","com.unity.render-pipelines.universal-config@17.0.3","com.unity.settings-manager@2.1.1","com.unity.burst@1.8.27","com.unity.collections@2.6.2","com.unity.dt.app-ui@2.1.1","com.unity.nuget.newtonsoft-json@3.2.2","com.unity.profiling.core@1.0.3","com.unity.scriptablebuildpipeline@2.5.1","com.unity.2d.common@12.0.1","com.unity.ai.generators@1.0.0-pre.12","com.unity.searcher@4.9.4","com.unity.nuget.mono-cecil@1.11.6","com.unity.test-framework.performance@3.2.0","com.unity.ai.toolkit@1.0.0-pre.12","com.unity.2d.sprite@1.0.0"],"Results":[]}
|
||||
@@ -1 +0,0 @@
|
||||
{"MeasurementCount":-1}
|
||||
@@ -119,6 +119,41 @@ NavMeshSettings:
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!21 &21467708
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: FloodSWE/HeightmapPreview
|
||||
m_Shader: {fileID: 4800000, guid: 942b8ce998a337a7aae19258096d6eb0, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _Intensity: 1
|
||||
- _MaxValue: 1
|
||||
- _MinValue: 0
|
||||
m_Colors: []
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
--- !u!1 &62740688
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -242,7 +277,7 @@ MeshRenderer:
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 659341460}
|
||||
- {fileID: 21467708}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
@@ -610,41 +645,6 @@ Transform:
|
||||
- {fileID: 65783701}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!21 &659341460
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: FloodSWE/HeightmapPreview
|
||||
m_Shader: {fileID: 4800000, guid: 942b8ce998a337a7aae19258096d6eb0, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _Intensity: 1
|
||||
- _MaxValue: 1
|
||||
- _MinValue: 0
|
||||
m_Colors: []
|
||||
m_BuildTextureStacks: []
|
||||
m_AllowLocking: 1
|
||||
--- !u!1 &670458858
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1036,7 +1036,7 @@ MonoBehaviour:
|
||||
activeTileX: 2
|
||||
activeTileY: 6
|
||||
applyTileOnStart: 1
|
||||
boundaryManifestAsset: {fileID: 4900000, guid: 0821b1fadc511cca9aa9c9dd4fdbb2f4, type: 3}
|
||||
boundaryManifestAsset: {fileID: 4900000, guid: e4bc67077f89c3cc5a1e68459e0ce009, type: 3}
|
||||
boundaryManifestPath: Resources/export_swe/swe_boundaries.json
|
||||
commandListenPort: 29010
|
||||
questHost:
|
||||
@@ -1053,6 +1053,10 @@ MonoBehaviour:
|
||||
applyDefaultSourceOnStart: 1
|
||||
defaultSourceId: 2
|
||||
defaultSourceLevel: 1
|
||||
verboseDiagnostics: 1
|
||||
simThroughputAveragingSeconds: 1
|
||||
simThroughputSmoothing: 0.35
|
||||
clientSignalTimeoutSeconds: 3
|
||||
--- !u!4 &1318639124
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1124,12 +1128,14 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: e8f415a5df42203ce9d71788e510308b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: FloodSWE.Runtime::FloodSWE.IO.SweTileLoader
|
||||
tileIndexCsv: {fileID: 4900000, guid: 5e690abad1f501d9b93346679e910d3b, type: 3}
|
||||
tileIndexCsv: {fileID: 4900000, guid: 976b11ecaf0bbb79ab2801e5b585488c, type: 3}
|
||||
sourceMode: 0
|
||||
tileIndexPath: export_swe/swe_tile_index.csv
|
||||
fileRoot:
|
||||
resourcesRoot: export_swe
|
||||
cacheTextures: 1
|
||||
verboseDiagnostics: 1
|
||||
logMissingTextures: 1
|
||||
--- !u!4 &1782632637
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -13,6 +13,7 @@ namespace FloodSWE.Networking
|
||||
[SerializeField] private SweQuestControlClient controlClient;
|
||||
[SerializeField] private Button button;
|
||||
[SerializeField] private TMP_Text label;
|
||||
[SerializeField] private TMP_InputField serverIpInput;
|
||||
|
||||
[Header("Labels")]
|
||||
[SerializeField] private string connectLabel = "Connect";
|
||||
@@ -40,6 +41,15 @@ namespace FloodSWE.Networking
|
||||
controlClient = FindFirstObjectByType<SweQuestControlClient>();
|
||||
}
|
||||
|
||||
EnsureServerIpInput();
|
||||
|
||||
if (serverIpInput != null)
|
||||
{
|
||||
serverIpInput.onValueChanged.AddListener(OnServerIpChanged);
|
||||
string serverHost = controlClient != null ? controlClient.serverHost : string.Empty;
|
||||
serverIpInput.SetTextWithoutNotify(serverHost ?? string.Empty);
|
||||
}
|
||||
|
||||
if (button != null)
|
||||
{
|
||||
button.onClick.AddListener(OnButtonPressed);
|
||||
@@ -50,6 +60,11 @@ namespace FloodSWE.Networking
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
if (serverIpInput != null)
|
||||
{
|
||||
serverIpInput.onValueChanged.RemoveListener(OnServerIpChanged);
|
||||
}
|
||||
|
||||
if (button != null)
|
||||
{
|
||||
button.onClick.RemoveListener(OnButtonPressed);
|
||||
@@ -133,5 +148,133 @@ namespace FloodSWE.Networking
|
||||
|
||||
button.interactable = interactable;
|
||||
}
|
||||
|
||||
private void OnServerIpChanged(string serverIp)
|
||||
{
|
||||
if (controlClient == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
controlClient.serverHost = serverIp ?? string.Empty;
|
||||
}
|
||||
|
||||
private void EnsureServerIpInput()
|
||||
{
|
||||
if (serverIpInput != null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
RectTransform panelRect = transform.parent as RectTransform;
|
||||
if (panelRect == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
TMP_InputField existingInput = panelRect.GetComponentInChildren<TMP_InputField>(true);
|
||||
if (existingInput != null)
|
||||
{
|
||||
serverIpInput = existingInput;
|
||||
return;
|
||||
}
|
||||
|
||||
serverIpInput = CreateServerIpInput(panelRect);
|
||||
}
|
||||
|
||||
private TMP_InputField CreateServerIpInput(RectTransform panelRect)
|
||||
{
|
||||
RectTransform buttonRect = button != null ? button.transform as RectTransform : null;
|
||||
if (buttonRect != null)
|
||||
{
|
||||
buttonRect.anchoredPosition = new Vector2(buttonRect.anchoredPosition.x, -95.0f);
|
||||
}
|
||||
|
||||
panelRect.sizeDelta = new Vector2(panelRect.sizeDelta.x, Mathf.Max(125.0f, panelRect.sizeDelta.y));
|
||||
|
||||
GameObject inputRoot = new GameObject(
|
||||
"Server IP Input",
|
||||
typeof(RectTransform),
|
||||
typeof(CanvasRenderer),
|
||||
typeof(Image),
|
||||
typeof(TMP_InputField));
|
||||
RectTransform inputRect = inputRoot.GetComponent<RectTransform>();
|
||||
inputRect.SetParent(panelRect, false);
|
||||
inputRect.anchorMin = new Vector2(0.0f, 1.0f);
|
||||
inputRect.anchorMax = new Vector2(0.0f, 1.0f);
|
||||
inputRect.pivot = new Vector2(0.0f, 1.0f);
|
||||
inputRect.anchoredPosition = new Vector2(25.0f, -60.0f);
|
||||
inputRect.sizeDelta = new Vector2(200.0f, 30.0f);
|
||||
|
||||
Image background = inputRoot.GetComponent<Image>();
|
||||
background.color = new Color(1.0f, 1.0f, 1.0f, 0.95f);
|
||||
|
||||
GameObject textAreaObject = new GameObject("Text Area", typeof(RectTransform), typeof(RectMask2D));
|
||||
RectTransform textAreaRect = textAreaObject.GetComponent<RectTransform>();
|
||||
textAreaRect.SetParent(inputRect, false);
|
||||
textAreaRect.anchorMin = Vector2.zero;
|
||||
textAreaRect.anchorMax = Vector2.one;
|
||||
textAreaRect.offsetMin = new Vector2(10.0f, 6.0f);
|
||||
textAreaRect.offsetMax = new Vector2(-10.0f, -7.0f);
|
||||
|
||||
TMP_FontAsset fontAsset = label != null ? label.font : TMP_Settings.defaultFontAsset;
|
||||
|
||||
TextMeshProUGUI placeholder = CreateInputText(
|
||||
"Placeholder",
|
||||
textAreaRect,
|
||||
fontAsset,
|
||||
"Server IP",
|
||||
new Color(0.45f, 0.45f, 0.45f, 0.9f));
|
||||
placeholder.fontStyle = FontStyles.Italic;
|
||||
|
||||
TextMeshProUGUI inputText = CreateInputText(
|
||||
"Text",
|
||||
textAreaRect,
|
||||
fontAsset,
|
||||
string.Empty,
|
||||
Color.black);
|
||||
|
||||
TMP_InputField inputField = inputRoot.GetComponent<TMP_InputField>();
|
||||
inputField.targetGraphic = background;
|
||||
inputField.textViewport = textAreaRect;
|
||||
inputField.textComponent = inputText;
|
||||
inputField.placeholder = placeholder;
|
||||
inputField.lineType = TMP_InputField.LineType.SingleLine;
|
||||
|
||||
return inputField;
|
||||
}
|
||||
|
||||
private static TextMeshProUGUI CreateInputText(
|
||||
string objectName,
|
||||
RectTransform parent,
|
||||
TMP_FontAsset fontAsset,
|
||||
string textValue,
|
||||
Color textColor)
|
||||
{
|
||||
GameObject textObject = new GameObject(objectName, typeof(RectTransform), typeof(CanvasRenderer), typeof(TextMeshProUGUI));
|
||||
RectTransform textRect = textObject.GetComponent<RectTransform>();
|
||||
textRect.SetParent(parent, false);
|
||||
textRect.anchorMin = Vector2.zero;
|
||||
textRect.anchorMax = Vector2.one;
|
||||
textRect.offsetMin = Vector2.zero;
|
||||
textRect.offsetMax = Vector2.zero;
|
||||
|
||||
TextMeshProUGUI text = textObject.GetComponent<TextMeshProUGUI>();
|
||||
text.font = fontAsset;
|
||||
if (fontAsset != null)
|
||||
{
|
||||
text.fontSharedMaterial = fontAsset.material;
|
||||
}
|
||||
text.text = textValue;
|
||||
text.color = textColor;
|
||||
text.fontSize = 20.0f;
|
||||
text.enableAutoSizing = true;
|
||||
text.fontSizeMin = 14.0f;
|
||||
text.fontSizeMax = 24.0f;
|
||||
text.alignment = TextAlignmentOptions.Left;
|
||||
text.enableWordWrapping = false;
|
||||
text.raycastTarget = false;
|
||||
return text;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ MonoBehaviour:
|
||||
m_OverrideGlobalSceneList: 1
|
||||
m_Scenes:
|
||||
- m_enabled: 1
|
||||
m_path: Assets/Scenes/SWE_test.unity
|
||||
m_path: Assets/Scenes/Server/SWE_test.unity
|
||||
m_HasScriptingDefines: 1
|
||||
m_ScriptingDefines: []
|
||||
m_PlayerSettingsYaml:
|
||||
@@ -173,10 +173,6 @@ MonoBehaviour:
|
||||
- line: '| preloadedAssets:'
|
||||
- line: '| - {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b,
|
||||
type: 3}'
|
||||
- line: '| - {fileID: 11400000, guid: 259d3ad4b6eeaa3378559ced8c31a7d2, type:
|
||||
2}'
|
||||
- line: '| - {fileID: 8117861954961215539, guid: 12bf1d9a7e4890d229eaf5a10886d34e,
|
||||
type: 2}'
|
||||
- line: '| metroInputSource: 0'
|
||||
- line: '| wsaTransparentSwapchain: 0'
|
||||
- line: '| m_HolographicPauseOnTrackingLoss: 1'
|
||||
|
||||
1165
Assets/_Recovery/0 (1).unity
Normal file
1165
Assets/_Recovery/0 (1).unity
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f7d40caa39c6f396cb54fa3e6e245899
|
||||
TextScriptImporter:
|
||||
guid: 9b15187b6929a71a98ea751fa856f74b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
1165
Assets/_Recovery/0.unity
Normal file
1165
Assets/_Recovery/0.unity
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c1f46813b46ef43abb5d45a35e235798
|
||||
TextScriptImporter:
|
||||
guid: 4221b128f2ac544afaf33e6e8075731e
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
@@ -149,8 +149,7 @@ PlayerSettings:
|
||||
preloadedAssets:
|
||||
- {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
|
||||
- {fileID: 11400000, guid: 259d3ad4b6eeaa3378559ced8c31a7d2, type: 2}
|
||||
- {fileID: 1015220237440941287, guid: 12bf1d9a7e4890d229eaf5a10886d34e, type: 2}
|
||||
- {fileID: -7350331264532487781, guid: b5caba342dc44f808b0b160addbc4aa4, type: 2}
|
||||
- {fileID: 8117861954961215539, guid: 12bf1d9a7e4890d229eaf5a10886d34e, type: 2}
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
m_HolographicPauseOnTrackingLoss: 1
|
||||
|
||||
Reference in New Issue
Block a user