Skip to content

Commit 99f37e9

Browse files
committed
static fix
1 parent 9ea2b3a commit 99f37e9

File tree

97 files changed

+763500
-277663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+763500
-277663
lines changed

Assets/Editor/StaticFixer.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
using UnityEditor;
5+
using UnityEditor.SceneManagement;
6+
using UnityEngine.SceneManagement;
7+
8+
public class StaticFixer : Editor
9+
{
10+
[MenuItem("Static Fixes/Fix Static Objects")]
11+
public static void Fix()
12+
{
13+
foreach (GameObject gameObject in Resources.FindObjectsOfTypeAll<GameObject>())
14+
{
15+
MeshRenderer renderer = gameObject.GetComponent<MeshRenderer>();
16+
17+
if (renderer != null)
18+
{
19+
gameObject.isStatic = renderer.isPartOfStaticBatch;
20+
continue;
21+
}
22+
23+
gameObject.isStatic = false;
24+
}
25+
26+
EditorSceneManager.MarkSceneDirty(SceneManager.GetActiveScene());
27+
}
28+
}

Assets/Editor/StaticFixer.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Mesh/26/Mesh.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ Mesh:
124124
m_BitSize: 0
125125
m_UVInfo: 0
126126
m_LocalAABB:
127-
m_Center: {x: -47.45041, y: 0.97968674, z: 0}
128-
m_Extent: {x: 632.54956, y: 71.51697, z: 0}
127+
m_Center: {x: 0, y: 0, z: 0}
128+
m_Extent: {x: 680, y: 130, z: 0.5}
129129
m_MeshUsageFlags: 0
130130
m_BakedConvexCollisionMesh:
131131
m_BakedTriangleCollisionMesh:

Assets/Mesh/40/Mesh.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ Mesh:
124124
m_BitSize: 0
125125
m_UVInfo: 0
126126
m_LocalAABB:
127-
m_Center: {x: -344.25, y: 0, z: 0}
128-
m_Extent: {x: 293.25, y: 65, z: 0}
127+
m_Center: {x: 0, y: 0, z: 0}
128+
m_Extent: {x: 637.5, y: 65, z: 0.5}
129129
m_MeshUsageFlags: 0
130130
m_BakedConvexCollisionMesh:
131131
m_BakedTriangleCollisionMesh:

Assets/Mesh/49/Mesh.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ Mesh:
124124
m_BitSize: 0
125125
m_UVInfo: 0
126126
m_LocalAABB:
127-
m_Center: {x: -1.451416, y: 2.1770782, z: 0}
128-
m_Extent: {x: 307.6935, y: 38.46169, z: 0}
127+
m_Center: {x: 0, y: 0, z: 0}
128+
m_Extent: {x: 600, y: 50, z: 0.5}
129129
m_MeshUsageFlags: 0
130130
m_BakedConvexCollisionMesh:
131131
m_BakedTriangleCollisionMesh:

Assets/Resources/characters/CharacterPrefab.prefab

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,29 @@
22
%TAG !u! tag:unity3d.com,2011:
33
--- !u!1001 &100100000
44
Prefab:
5-
serializedVersion: 2
65
m_ObjectHideFlags: 1
6+
serializedVersion: 2
77
m_Modification:
88
m_TransformParent: {fileID: 0}
99
m_Modifications: []
1010
m_RemovedComponents: []
1111
m_ParentPrefab: {fileID: 0}
1212
m_RootGameObject: {fileID: 1966731823339369}
1313
m_IsPrefabParent: 1
14-
m_IsExploded: 0
1514
--- !u!1 &1966731823339369
1615
GameObject:
17-
serializedVersion: 4
1816
m_ObjectHideFlags: 0
1917
m_PrefabParentObject: {fileID: 0}
2018
m_PrefabInternal: {fileID: 100100000}
19+
serializedVersion: 5
2120
m_Component:
22-
- 4: {fileID: 4290570142214743}
23-
- 111: {fileID: 111721194482525543}
24-
- 114: {fileID: 114980228506328286}
25-
- 114: {fileID: 114461988911228618}
26-
- 114: {fileID: 114865653059443566}
27-
- 114: {fileID: 114195717269048205}
28-
- 114: {fileID: 114898817519367157}
21+
- component: {fileID: 4290570142214743}
22+
- component: {fileID: 111721194482525543}
23+
- component: {fileID: 114980228506328286}
24+
- component: {fileID: 114461988911228618}
25+
- component: {fileID: 114865653059443566}
26+
- component: {fileID: 114195717269048205}
27+
- component: {fileID: 114898817519367157}
2928
m_Layer: 0
3029
m_Name: CharacterPrefab
3130
m_TagString: Untagged
@@ -44,41 +43,35 @@ Transform:
4443
m_LocalScale: {x: 1, y: 1, z: 1}
4544
m_Children: []
4645
m_Father: {fileID: 0}
46+
m_RootOrder: 0
47+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4748
--- !u!111 &111721194482525543
4849
Animation:
49-
serializedVersion: 3
5050
m_ObjectHideFlags: 0
5151
m_PrefabParentObject: {fileID: 0}
5252
m_PrefabInternal: {fileID: 100100000}
5353
m_GameObject: {fileID: 1966731823339369}
5454
m_Enabled: 1
55+
serializedVersion: 3
5556
m_Animation: {fileID: 0}
5657
m_Animations: []
5758
m_WrapMode: 0
5859
m_PlayAutomatically: 0
5960
m_AnimatePhysics: 0
6061
m_CullingType: 0
61-
m_UserAABB:
62-
m_Center: {x: 0, y: 0, z: 0}
63-
m_Extent: {x: 0, y: 0, z: 0}
64-
--- !u!114 &114980228506328286
62+
--- !u!114 &114195717269048205
6563
MonoBehaviour:
6664
m_ObjectHideFlags: 0
6765
m_PrefabParentObject: {fileID: 0}
6866
m_PrefabInternal: {fileID: 100100000}
6967
m_GameObject: {fileID: 1966731823339369}
7068
m_Enabled: 1
7169
m_EditorHideFlags: 0
72-
m_Script: {fileID: 11500000, guid: bd6245a8adae9bb55440fcfe8cafc69a, type: 3}
73-
m_Name:
74-
jointAnimation: {fileID: 0}
75-
defaultBlendSpeed: 0.3
76-
specificAnimSettings: []
77-
alsoPlayOnAllChildren: 1
78-
overrideAnimFolder:
79-
animFrame: 0
80-
extraAnimPlayers: []
81-
extraTaggedAnimPlayers: []
70+
m_Script: {fileID: 11500000, guid: 9deb42e7ebc7d9000d6a75dff5974047, type: 3}
71+
m_Name:
72+
m_EditorClassIdentifier:
73+
playRandomAnimAtStartup: 0
74+
cameraShakeIntensityMult: 1
8275
--- !u!114 &114461988911228618
8376
MonoBehaviour:
8477
m_ObjectHideFlags: 0
@@ -88,7 +81,8 @@ MonoBehaviour:
8881
m_Enabled: 1
8982
m_EditorHideFlags: 0
9083
m_Script: {fileID: 11500000, guid: d23147a98738dd3f21f8523d6dbc0a95, type: 3}
91-
m_Name:
84+
m_Name:
85+
m_EditorClassIdentifier:
9286
joints: []
9387
--- !u!114 &114865653059443566
9488
MonoBehaviour:
@@ -99,7 +93,8 @@ MonoBehaviour:
9993
m_Enabled: 1
10094
m_EditorHideFlags: 0
10195
m_Script: {fileID: 11500000, guid: 82ef4aa966cbc2b226b4b1bfbc09eb3d, type: 3}
102-
m_Name:
96+
m_Name:
97+
m_EditorClassIdentifier:
10398
randomAnimSets: []
10499
attackActive: 0
105100
animatedWalkSpeed: 3
@@ -109,31 +104,39 @@ MonoBehaviour:
109104
bluntImpactEffect: {fileID: 0}
110105
bluntCriticalImpactEffect: {fileID: 0}
111106
snapToGround: 1
112-
--- !u!114 &114195717269048205
107+
--- !u!114 &114898817519367157
113108
MonoBehaviour:
114109
m_ObjectHideFlags: 0
115110
m_PrefabParentObject: {fileID: 0}
116111
m_PrefabInternal: {fileID: 100100000}
117112
m_GameObject: {fileID: 1966731823339369}
118113
m_Enabled: 1
119114
m_EditorHideFlags: 0
120-
m_Script: {fileID: 11500000, guid: 9deb42e7ebc7d9000d6a75dff5974047, type: 3}
121-
m_Name:
122-
playRandomAnimAtStartup: 0
123-
cameraShakeIntensityMult: 1
124-
--- !u!114 &114898817519367157
115+
m_Script: {fileID: 11500000, guid: 56b88dcc4bb2c5eaf252d2940540398d, type: 3}
116+
m_Name:
117+
m_EditorClassIdentifier:
118+
defaultMinDistance: 1
119+
defaultMaxDistance: 500
120+
soundThemeKey:
121+
recordKey:
122+
onLoadedSoundEvent:
123+
recordKey:
124+
--- !u!114 &114980228506328286
125125
MonoBehaviour:
126126
m_ObjectHideFlags: 0
127127
m_PrefabParentObject: {fileID: 0}
128128
m_PrefabInternal: {fileID: 100100000}
129129
m_GameObject: {fileID: 1966731823339369}
130130
m_Enabled: 1
131131
m_EditorHideFlags: 0
132-
m_Script: {fileID: 11500000, guid: 56b88dcc4bb2c5eaf252d2940540398d, type: 3}
133-
m_Name:
134-
defaultMinDistance: 1
135-
defaultMaxDistance: 500
136-
soundThemeKey:
137-
recordKey:
138-
onLoadedSoundEvent:
139-
recordKey:
132+
m_Script: {fileID: 11500000, guid: bd6245a8adae9bb55440fcfe8cafc69a, type: 3}
133+
m_Name:
134+
m_EditorClassIdentifier:
135+
jointAnimation: {fileID: 0}
136+
defaultBlendSpeed: 0.3
137+
specificAnimSettings: []
138+
alsoPlayOnAllChildren: 1
139+
overrideAnimFolder:
140+
animFrame: 0
141+
extraAnimPlayers: []
142+
extraTaggedAnimPlayers: []

0 commit comments

Comments
 (0)