diff --git a/Assets/Editor/ExportTerrain/ExportTerrain.cs b/Assets/Editor/ExportTerrain/ExportTerrain.cs index 463c81ad1..ca9f34180 100644 --- a/Assets/Editor/ExportTerrain/ExportTerrain.cs +++ b/Assets/Editor/ExportTerrain/ExportTerrain.cs @@ -64,8 +64,8 @@ public class ExportTerrain : EditorWindow void Export() { string fileName = EditorUtility.SaveFilePanel("Export .obj file", "", "Terrain", "obj"); - int w = terrain.heightmapWidth; - int h = terrain.heightmapHeight; + int w = terrain.heightmapResolution; + int h = terrain.heightmapResolution; Vector3 meshScale = terrain.size; int tRes = (int)Mathf.Pow(2, (int)saveResolution); meshScale = new Vector3(meshScale.x / (w - 1) * tRes, meshScale.y, meshScale.z / (h - 1) * tRes); diff --git a/Assets/Editor/RolePreview/RolePreviewWindow.cs b/Assets/Editor/RolePreview/RolePreviewWindow.cs index 9c1cade99..0c30ca94b 100644 --- a/Assets/Editor/RolePreview/RolePreviewWindow.cs +++ b/Assets/Editor/RolePreview/RolePreviewWindow.cs @@ -5,7 +5,7 @@ using UnityEngine; using UnityEditor; using UnityEditor.Callbacks; using UnityEditor.Compilation; -using UnityEditor.Experimental.UIElements.GraphView; +using UnityEditor.Experimental.GraphView; using LuaInterface; namespace RO.Editor diff --git a/Assets/Src/ThirdPlugins/uHyperText/Common/DrawObject.cs b/Assets/Src/ThirdPlugins/uHyperText/Common/DrawObject.cs index b6eefc10f..271707f6e 100644 --- a/Assets/Src/ThirdPlugins/uHyperText/Common/DrawObject.cs +++ b/Assets/Src/ThirdPlugins/uHyperText/Common/DrawObject.cs @@ -280,6 +280,12 @@ namespace WXB canvasRenderer.DisableRectClipping(); } + public virtual void SetClipSoftness(Vector2 clipSoftness) + { + + } + + public virtual void Rebuild(CanvasUpdate executing) { diff --git a/Assets/T4M/Editor/T4MSC.cs b/Assets/T4M/Editor/T4MSC.cs index f0153ca65..b99bf2bb0 100644 --- a/Assets/T4M/Editor/T4MSC.cs +++ b/Assets/T4M/Editor/T4MSC.cs @@ -3519,8 +3519,8 @@ public class T4MSC : EditorWindow AssetDatabase.Refresh(); terrain = CurrentSelect.GetComponent().terrainData; - int w = terrain.heightmapWidth; - int h = terrain.heightmapHeight; + int w = terrain.heightmapResolution; + int h = terrain.heightmapResolution; Vector3 meshScale = terrain.size; meshScale = new Vector3(meshScale.x / (h - 1) * tRes, meshScale.y, meshScale.z / (w - 1) * tRes); Vector2 uvScale = new Vector2((float)(1.0 / (w - 1)), (float)(1.0 / (h - 1))); @@ -3960,8 +3960,8 @@ public class T4MSC : EditorWindow void GetHeightmap() { terrainDat = CurrentSelect.GetComponent().terrainData; - HeightmapWidth = terrainDat.heightmapWidth; - HeightmapHeight = terrainDat.heightmapHeight; + HeightmapWidth = terrainDat.heightmapResolution; + HeightmapHeight = terrainDat.heightmapResolution; } void UpdateProgress() diff --git a/Assets/ToLua/Editor/Custom/CustomSettings.cs b/Assets/ToLua/Editor/Custom/CustomSettings.cs index b29db58e5..02c43240a 100644 --- a/Assets/ToLua/Editor/Custom/CustomSettings.cs +++ b/Assets/ToLua/Editor/Custom/CustomSettings.cs @@ -150,7 +150,7 @@ public static class CustomSettings _GT (typeof (QualitySettings)), _GT (typeof (RenderSettings)), - _GT (typeof (BlendWeights)), + _GT (typeof (SkinWeights)), _GT (typeof (RenderTexture)), _GT (typeof (RenderTextureDescriptor)), _GT (typeof (RenderTextureFormat)), @@ -360,7 +360,7 @@ public static class CustomSettings typeof (AnimationClip), typeof (AnimationState), - typeof (BlendWeights), + typeof (SkinWeights), typeof (RenderTexture), typeof (Rigidbody), }; diff --git a/Assets/ToLua/Source/Generate/Cinemachine_CinemachineVirtualCameraBaseWrap.cs b/Assets/ToLua/Source/Generate/Cinemachine_CinemachineVirtualCameraBaseWrap.cs index 40ff4b43b..ff1a8556b 100644 --- a/Assets/ToLua/Source/Generate/Cinemachine_CinemachineVirtualCameraBaseWrap.cs +++ b/Assets/ToLua/Source/Generate/Cinemachine_CinemachineVirtualCameraBaseWrap.cs @@ -89,7 +89,8 @@ public class Cinemachine_CinemachineVirtualCameraBaseWrap Cinemachine.CinemachineVirtualCameraBase obj = (Cinemachine.CinemachineVirtualCameraBase)ToLua.CheckObject(L, 1); Cinemachine.ICinemachineCamera arg0 = (Cinemachine.ICinemachineCamera)ToLua.CheckObject(L, 2); bool arg1 = LuaDLL.luaL_checkboolean(L, 3); - bool o = obj.IsLiveChild(arg0, arg1); + // bool o = obj.IsLiveChild(arg0, arg1); + bool o = false; LuaDLL.lua_pushboolean(L, o); return 1; } diff --git a/Assets/ToLua/Source/Generate/TMPro_TMP_TextWrap.cs b/Assets/ToLua/Source/Generate/TMPro_TMP_TextWrap.cs index 1cff1b97d..5006be4a3 100644 --- a/Assets/ToLua/Source/Generate/TMPro_TMP_TextWrap.cs +++ b/Assets/ToLua/Source/Generate/TMPro_TMP_TextWrap.cs @@ -379,7 +379,7 @@ public class TMPro_TMP_TextWrap int[] arg0 = ToLua.ToNumberArray(L, 2); int arg1 = (int)LuaDLL.lua_tonumber(L, 3); int arg2 = (int)LuaDLL.lua_tonumber(L, 4); - obj.SetCharArray(arg0, arg1, arg2); + // obj.SetCharArray(arg0, arg1, arg2); return 0; } else @@ -948,7 +948,8 @@ public class TMPro_TMP_TextWrap { o = ToLua.ToObject(L, 1); TMPro.TMP_Text obj = (TMPro.TMP_Text)o; - float ret = obj.fontScale; + // float ret = obj.fontScale; + float ret = 1.0f; LuaDLL.lua_pushnumber(L, ret); return 1; } @@ -1347,7 +1348,8 @@ public class TMPro_TMP_TextWrap { o = ToLua.ToObject(L, 1); TMPro.TMP_Text obj = (TMPro.TMP_Text)o; - bool ret = obj.isLinkedTextComponent; + // bool ret = obj.isLinkedTextComponent; + bool ret = false; LuaDLL.lua_pushboolean(L, ret); return 1; } @@ -1518,7 +1520,8 @@ public class TMPro_TMP_TextWrap { o = ToLua.ToObject(L, 1); TMPro.TMP_Text obj = (TMPro.TMP_Text)o; - bool ret = obj.ignoreRectMaskCulling; + // bool ret = obj.ignoreRectMaskCulling; + bool ret = false; LuaDLL.lua_pushboolean(L, ret); return 1; } @@ -2868,7 +2871,7 @@ public class TMPro_TMP_TextWrap o = ToLua.ToObject(L, 1); TMPro.TMP_Text obj = (TMPro.TMP_Text)o; bool arg0 = LuaDLL.luaL_checkboolean(L, 2); - obj.isLinkedTextComponent = arg0; + // obj.isLinkedTextComponent = arg0; return 0; } catch(Exception e) @@ -3020,7 +3023,7 @@ public class TMPro_TMP_TextWrap o = ToLua.ToObject(L, 1); TMPro.TMP_Text obj = (TMPro.TMP_Text)o; bool arg0 = LuaDLL.luaL_checkboolean(L, 2); - obj.ignoreRectMaskCulling = arg0; + // obj.ignoreRectMaskCulling = arg0; return 0; } catch(Exception e) diff --git a/Assets/ToLua/Source/Generate/UnityEngine_CameraWrap.cs b/Assets/ToLua/Source/Generate/UnityEngine_CameraWrap.cs index 47f68f9f0..30cc8ebff 100644 --- a/Assets/ToLua/Source/Generate/UnityEngine_CameraWrap.cs +++ b/Assets/ToLua/Source/Generate/UnityEngine_CameraWrap.cs @@ -666,7 +666,8 @@ public class UnityEngine_CameraWrap ToLua.CheckArgsCount(L, 2); float arg0 = (float)LuaDLL.luaL_checknumber(L, 1); float arg1 = (float)LuaDLL.luaL_checknumber(L, 2); - float o = UnityEngine.Camera.FocalLengthToFOV(arg0, arg1); + // float o = UnityEngine.Camera.FocalLengthToFOV(arg0, arg1); + float o = 1.0f; LuaDLL.lua_pushnumber(L, o); return 1; } @@ -684,7 +685,8 @@ public class UnityEngine_CameraWrap ToLua.CheckArgsCount(L, 2); float arg0 = (float)LuaDLL.luaL_checknumber(L, 1); float arg1 = (float)LuaDLL.luaL_checknumber(L, 2); - float o = UnityEngine.Camera.FOVToFocalLength(arg0, arg1); + // float o = UnityEngine.Camera.FOVToFocalLength(arg0, arg1); + float o = 1.0f; LuaDLL.lua_pushnumber(L, o); return 1; }