Skip to content

Commit 41a1f26

Browse files
jcs090218jcs090218
committed
chore: Update PE
1 parent adcf8be commit 41a1f26

16 files changed

+88
-94
lines changed

‎Assets/PackageExporter/Editor/PackageExporter.dll

1 KB
Binary file not shown.

‎Assets/PackageExporter/template/template.unityignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
# Version: [VERSION_NO]
77
# Creation Date: [CREATION_DATE]
88
#
9-
# Package Link: https://github.com/Pixisoft/PackageExporter
9+
# Package Link: https://github.com/jcs090218/PackageExporter
1010
# Author: Shen, Jen-Chieh
11-
# Email: pixisoft.tw@gmail.com
11+
# Email: jcs090218@gmail.com
1212
#
1313

1414
# Ignore this plugin itself.
15-
PackageExporter
15+
PackageExporter/

‎Assets/PackageExporter/unityignore/UnityLua.unityignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# unityignore file.
44
#
55
# Package Name: UnityLua
6-
# Version: 0.1.0
6+
# Version: 0.1.1
77
# Creation Date: 2020-03-24 17:15:43
88
#
99
# Package Link: https://github.com/jcs090218/UnityPackageExporter

‎Assets/ToLua/Source/Generate/UnityEngine_AnimatorWrap.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2476,7 +2476,7 @@ static int get_keepAnimatorControllerStateOnDisable(IntPtr L)
24762476
{
24772477
o = ToLua.ToObject(L, 1);
24782478
UnityEngine.Animator obj = (UnityEngine.Animator)o;
2479-
bool ret = obj.keepAnimatorControllerStateOnDisable;
2479+
bool ret = obj.keepAnimatorStateOnDisable;
24802480
LuaDLL.lua_pushboolean(L, ret);
24812481
return 1;
24822482
}
@@ -2838,7 +2838,7 @@ static int set_keepAnimatorControllerStateOnDisable(IntPtr L)
28382838
o = ToLua.ToObject(L, 1);
28392839
UnityEngine.Animator obj = (UnityEngine.Animator)o;
28402840
bool arg0 = LuaDLL.luaL_checkboolean(L, 2);
2841-
obj.keepAnimatorControllerStateOnDisable = arg0;
2841+
obj.keepAnimatorStateOnDisable = arg0;
28422842
return 0;
28432843
}
28442844
catch(Exception e)

‎Assets/ToLua/Source/Generate/UnityEngine_ColliderWrap.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ static int get_sharedMaterial(IntPtr L)
226226
{
227227
o = ToLua.ToObject(L, 1);
228228
UnityEngine.Collider obj = (UnityEngine.Collider)o;
229-
UnityEngine.PhysicMaterial ret = obj.sharedMaterial;
229+
UnityEngine.PhysicsMaterial ret = obj.sharedMaterial;
230230
ToLua.Push(L, ret);
231231
return 1;
232232
}
@@ -245,7 +245,7 @@ static int get_material(IntPtr L)
245245
{
246246
o = ToLua.ToObject(L, 1);
247247
UnityEngine.Collider obj = (UnityEngine.Collider)o;
248-
UnityEngine.PhysicMaterial ret = obj.material;
248+
UnityEngine.PhysicsMaterial ret = obj.material;
249249
ToLua.Push(L, ret);
250250
return 1;
251251
}
@@ -321,7 +321,7 @@ static int set_sharedMaterial(IntPtr L)
321321
{
322322
o = ToLua.ToObject(L, 1);
323323
UnityEngine.Collider obj = (UnityEngine.Collider)o;
324-
UnityEngine.PhysicMaterial arg0 = (UnityEngine.PhysicMaterial)ToLua.CheckObject<UnityEngine.PhysicMaterial>(L, 2);
324+
UnityEngine.PhysicsMaterial arg0 = (UnityEngine.PhysicsMaterial)ToLua.CheckObject<UnityEngine.PhysicsMaterial>(L, 2);
325325
obj.sharedMaterial = arg0;
326326
return 0;
327327
}
@@ -340,7 +340,7 @@ static int set_material(IntPtr L)
340340
{
341341
o = ToLua.ToObject(L, 1);
342342
UnityEngine.Collider obj = (UnityEngine.Collider)o;
343-
UnityEngine.PhysicMaterial arg0 = (UnityEngine.PhysicMaterial)ToLua.CheckObject<UnityEngine.PhysicMaterial>(L, 2);
343+
UnityEngine.PhysicsMaterial arg0 = (UnityEngine.PhysicsMaterial)ToLua.CheckObject<UnityEngine.PhysicsMaterial>(L, 2);
344344
obj.material = arg0;
345345
return 0;
346346
}

‎Assets/ToLua/Source/Generate/UnityEngine_LightTypeWrap.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static int get_Point(IntPtr L)
5353
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
5454
static int get_Area(IntPtr L)
5555
{
56-
ToLua.Push(L, UnityEngine.LightType.Area);
56+
ToLua.Push(L, UnityEngine.LightType.Rectangle);
5757
return 1;
5858
}
5959

‎Assets/ToLua/Source/Generate/UnityEngine_QualitySettingsWrap.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ static int get_masterTextureLimit(IntPtr L)
364364
{
365365
try
366366
{
367-
LuaDLL.lua_pushinteger(L, UnityEngine.QualitySettings.masterTextureLimit);
367+
LuaDLL.lua_pushinteger(L, UnityEngine.QualitySettings.globalTextureMipmapLimit);
368368
return 1;
369369
}
370370
catch (Exception e)
@@ -867,7 +867,7 @@ static int set_masterTextureLimit(IntPtr L)
867867
try
868868
{
869869
int arg0 = (int)LuaDLL.luaL_checknumber(L, 2);
870-
UnityEngine.QualitySettings.masterTextureLimit = arg0;
870+
UnityEngine.QualitySettings.globalTextureMipmapLimit = arg0;
871871
return 0;
872872
}
873873
catch (Exception e)

‎Assets/ToLua/Source/Generate/UnityEngine_RigidbodyWrap.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ static int get_velocity(IntPtr L)
679679
{
680680
o = ToLua.ToObject(L, 1);
681681
UnityEngine.Rigidbody obj = (UnityEngine.Rigidbody)o;
682-
UnityEngine.Vector3 ret = obj.velocity;
682+
UnityEngine.Vector3 ret = obj.linearVelocity;
683683
ToLua.Push(L, ret);
684684
return 1;
685685
}
@@ -717,7 +717,7 @@ static int get_drag(IntPtr L)
717717
{
718718
o = ToLua.ToObject(L, 1);
719719
UnityEngine.Rigidbody obj = (UnityEngine.Rigidbody)o;
720-
float ret = obj.drag;
720+
float ret = obj.linearDamping;
721721
LuaDLL.lua_pushnumber(L, ret);
722722
return 1;
723723
}
@@ -736,7 +736,7 @@ static int get_angularDrag(IntPtr L)
736736
{
737737
o = ToLua.ToObject(L, 1);
738738
UnityEngine.Rigidbody obj = (UnityEngine.Rigidbody)o;
739-
float ret = obj.angularDrag;
739+
float ret = obj.angularDamping;
740740
LuaDLL.lua_pushnumber(L, ret);
741741
return 1;
742742
}
@@ -1117,7 +1117,7 @@ static int set_velocity(IntPtr L)
11171117
o = ToLua.ToObject(L, 1);
11181118
UnityEngine.Rigidbody obj = (UnityEngine.Rigidbody)o;
11191119
UnityEngine.Vector3 arg0 = ToLua.ToVector3(L, 2);
1120-
obj.velocity = arg0;
1120+
obj.linearVelocity = arg0;
11211121
return 0;
11221122
}
11231123
catch(Exception e)
@@ -1155,7 +1155,7 @@ static int set_drag(IntPtr L)
11551155
o = ToLua.ToObject(L, 1);
11561156
UnityEngine.Rigidbody obj = (UnityEngine.Rigidbody)o;
11571157
float arg0 = (float)LuaDLL.luaL_checknumber(L, 2);
1158-
obj.drag = arg0;
1158+
obj.linearDamping = arg0;
11591159
return 0;
11601160
}
11611161
catch(Exception e)
@@ -1174,7 +1174,7 @@ static int set_angularDrag(IntPtr L)
11741174
o = ToLua.ToObject(L, 1);
11751175
UnityEngine.Rigidbody obj = (UnityEngine.Rigidbody)o;
11761176
float arg0 = (float)LuaDLL.luaL_checknumber(L, 2);
1177-
obj.angularDrag = arg0;
1177+
obj.angularDamping = arg0;
11781178
return 0;
11791179
}
11801180
catch(Exception e)

‎Assets/ToLua/Source/Generate/UnityEngine_TextureWrap.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static int get_masterTextureLimit(IntPtr L)
150150
{
151151
try
152152
{
153-
LuaDLL.lua_pushinteger(L, UnityEngine.Texture.masterTextureLimit);
153+
LuaDLL.lua_pushinteger(L, UnityEngine.Texture.globalMipmapLimit);
154154
return 1;
155155
}
156156
catch (Exception e)
@@ -660,7 +660,7 @@ static int set_masterTextureLimit(IntPtr L)
660660
try
661661
{
662662
int arg0 = (int)LuaDLL.luaL_checknumber(L, 2);
663-
UnityEngine.Texture.masterTextureLimit = arg0;
663+
UnityEngine.Texture.globalMipmapLimit = arg0;
664664
return 0;
665665
}
666666
catch (Exception e)

‎Packages/manifest.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"dependencies": {
3-
"com.unity.collab-proxy": "1.13.5",
4-
"com.unity.ide.rider": "3.0.7",
5-
"com.unity.ide.visualstudio": "2.0.12",
6-
"com.unity.ide.vscode": "1.2.4",
7-
"com.unity.test-framework": "1.1.29",
8-
"com.unity.textmeshpro": "3.0.6",
9-
"com.unity.timeline": "1.6.2",
10-
"com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.19-preview",
11-
"com.unity.ugui": "1.0.0",
3+
"com.unity.ai.navigation": "2.0.0",
4+
"com.unity.collab-proxy": "2.4.3",
5+
"com.unity.ide.rider": "3.0.28",
6+
"com.unity.ide.visualstudio": "2.0.22",
7+
"com.unity.test-framework": "1.4.4",
8+
"com.unity.timeline": "1.8.7",
9+
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",
10+
"com.unity.ugui": "2.0.0",
11+
"com.unity.modules.accessibility": "1.0.0",
1212
"com.unity.modules.ai": "1.0.0",
1313
"com.unity.modules.androidjni": "1.0.0",
1414
"com.unity.modules.animation": "1.0.0",

‎Packages/packages-lock.json

Lines changed: 36 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
11
{
22
"dependencies": {
3-
"com.unity.collab-proxy": {
4-
"version": "1.13.5",
3+
"com.unity.ai.navigation": {
4+
"version": "2.0.0",
55
"depth": 0,
66
"source": "registry",
77
"dependencies": {
8-
"com.unity.nuget.newtonsoft-json": "2.0.0",
9-
"com.unity.services.core": "1.0.1"
8+
"com.unity.modules.ai": "1.0.0"
109
},
1110
"url": "https://packages.unity.com"
1211
},
12+
"com.unity.collab-proxy": {
13+
"version": "2.4.3",
14+
"depth": 0,
15+
"source": "registry",
16+
"dependencies": {},
17+
"url": "https://packages.unity.com"
18+
},
1319
"com.unity.ext.nunit": {
14-
"version": "1.0.6",
20+
"version": "2.0.5",
1521
"depth": 1,
1622
"source": "registry",
1723
"dependencies": {},
1824
"url": "https://packages.unity.com"
1925
},
2026
"com.unity.ide.rider": {
21-
"version": "3.0.7",
27+
"version": "3.0.28",
2228
"depth": 0,
2329
"source": "registry",
2430
"dependencies": {
@@ -27,75 +33,43 @@
2733
"url": "https://packages.unity.com"
2834
},
2935
"com.unity.ide.visualstudio": {
30-
"version": "2.0.12",
36+
"version": "2.0.22",
3137
"depth": 0,
3238
"source": "registry",
3339
"dependencies": {
3440
"com.unity.test-framework": "1.1.9"
3541
},
3642
"url": "https://packages.unity.com"
3743
},
38-
"com.unity.ide.vscode": {
39-
"version": "1.2.4",
40-
"depth": 0,
41-
"source": "registry",
42-
"dependencies": {},
43-
"url": "https://packages.unity.com"
44-
},
45-
"com.unity.nuget.newtonsoft-json": {
46-
"version": "2.0.0",
47-
"depth": 1,
48-
"source": "registry",
49-
"dependencies": {},
50-
"url": "https://packages.unity.com"
51-
},
52-
"com.unity.services.core": {
53-
"version": "1.0.1",
54-
"depth": 1,
55-
"source": "registry",
56-
"dependencies": {
57-
"com.unity.modules.unitywebrequest": "1.0.0"
58-
},
59-
"url": "https://packages.unity.com"
60-
},
6144
"com.unity.sysroot": {
62-
"version": "0.1.19-preview",
45+
"version": "2.0.10",
6346
"depth": 1,
6447
"source": "registry",
6548
"dependencies": {},
6649
"url": "https://packages.unity.com"
6750
},
6851
"com.unity.sysroot.linux-x86_64": {
69-
"version": "0.1.14-preview",
52+
"version": "2.0.9",
7053
"depth": 1,
7154
"source": "registry",
7255
"dependencies": {
73-
"com.unity.sysroot": "0.1.18-preview"
56+
"com.unity.sysroot": "2.0.10"
7457
},
7558
"url": "https://packages.unity.com"
7659
},
7760
"com.unity.test-framework": {
78-
"version": "1.1.29",
61+
"version": "1.4.4",
7962
"depth": 0,
8063
"source": "registry",
8164
"dependencies": {
82-
"com.unity.ext.nunit": "1.0.6",
65+
"com.unity.ext.nunit": "2.0.3",
8366
"com.unity.modules.imgui": "1.0.0",
8467
"com.unity.modules.jsonserialize": "1.0.0"
8568
},
8669
"url": "https://packages.unity.com"
8770
},
88-
"com.unity.textmeshpro": {
89-
"version": "3.0.6",
90-
"depth": 0,
91-
"source": "registry",
92-
"dependencies": {
93-
"com.unity.ugui": "1.0.0"
94-
},
95-
"url": "https://packages.unity.com"
96-
},
9771
"com.unity.timeline": {
98-
"version": "1.6.2",
72+
"version": "1.8.7",
9973
"depth": 0,
10074
"source": "registry",
10175
"dependencies": {
@@ -107,24 +81,30 @@
10781
"url": "https://packages.unity.com"
10882
},
10983
"com.unity.toolchain.win-x86_64-linux-x86_64": {
110-
"version": "0.1.19-preview",
84+
"version": "2.0.9",
11185
"depth": 0,
11286
"source": "registry",
11387
"dependencies": {
114-
"com.unity.sysroot": "0.1.19-preview",
115-
"com.unity.sysroot.linux-x86_64": "0.1.14-preview"
88+
"com.unity.sysroot": "2.0.10",
89+
"com.unity.sysroot.linux-x86_64": "2.0.9"
11690
},
11791
"url": "https://packages.unity.com"
11892
},
11993
"com.unity.ugui": {
120-
"version": "1.0.0",
94+
"version": "2.0.0",
12195
"depth": 0,
12296
"source": "builtin",
12397
"dependencies": {
12498
"com.unity.modules.ui": "1.0.0",
12599
"com.unity.modules.imgui": "1.0.0"
126100
}
127101
},
102+
"com.unity.modules.accessibility": {
103+
"version": "1.0.0",
104+
"depth": 0,
105+
"source": "builtin",
106+
"dependencies": {}
107+
},
128108
"com.unity.modules.ai": {
129109
"version": "1.0.0",
130110
"depth": 0,
@@ -172,6 +152,12 @@
172152
"com.unity.modules.animation": "1.0.0"
173153
}
174154
},
155+
"com.unity.modules.hierarchycore": {
156+
"version": "1.0.0",
157+
"depth": 1,
158+
"source": "builtin",
159+
"dependencies": {}
160+
},
175161
"com.unity.modules.imageconversion": {
176162
"version": "1.0.0",
177163
"depth": 0,
@@ -261,17 +247,7 @@
261247
"com.unity.modules.ui": "1.0.0",
262248
"com.unity.modules.imgui": "1.0.0",
263249
"com.unity.modules.jsonserialize": "1.0.0",
264-
"com.unity.modules.uielementsnative": "1.0.0"
265-
}
266-
},
267-
"com.unity.modules.uielementsnative": {
268-
"version": "1.0.0",
269-
"depth": 1,
270-
"source": "builtin",
271-
"dependencies": {
272-
"com.unity.modules.ui": "1.0.0",
273-
"com.unity.modules.imgui": "1.0.0",
274-
"com.unity.modules.jsonserialize": "1.0.0"
250+
"com.unity.modules.hierarchycore": "1.0.0"
275251
}
276252
},
277253
"com.unity.modules.umbra": {

‎ProjectSettings/MultiplayerManager.asset

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!655991488 &1
4+
MultiplayerManager:
5+
m_ObjectHideFlags: 0
6+
m_EnableMultiplayerRoles: 0
7+
m_StrippingTypes: {}

‎ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.2.0f1
2-
m_EditorVersionWithRevision: 2021.2.0f1 (4bf1ec4b23c9)
1+
m_EditorVersion: 6000.0.11f1
2+
m_EditorVersionWithRevision: 6000.0.11f1 (fa01dd6b76d5)

‎ProjectSettings/boot.config

Whitespace-only changes.

0 commit comments

Comments
 (0)