Skip to content

Commit 194a483

Browse files
committed
Update to unity 6
+ fix some prefabs use broken SG material
1 parent ffdacc4 commit 194a483

18 files changed

+6791
-22273
lines changed

Assets/Content/Prefabs/Rome/Flag_View.prefab Assets/Content/Prefabs/Rome/Flag.prefab

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &2290321091419083719
3+
--- !u!1 &5164685921297025176
44
GameObject:
55
m_ObjectHideFlags: 0
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
99
serializedVersion: 6
1010
m_Component:
11-
- component: {fileID: 2290321091419083738}
12-
- component: {fileID: 2290321091419083718}
11+
- component: {fileID: 7378035945727941738}
12+
- component: {fileID: 338085302890227377}
1313
m_Layer: 0
14-
m_Name: Flag_View
14+
m_Name: Flag
1515
m_TagString: Untagged
1616
m_Icon: {fileID: 0}
1717
m_NavMeshLayer: 0
1818
m_StaticEditorFlags: 0
1919
m_IsActive: 1
20-
--- !u!4 &2290321091419083738
20+
--- !u!4 &7378035945727941738
2121
Transform:
2222
m_ObjectHideFlags: 0
2323
m_CorrespondingSourceObject: {fileID: 0}
2424
m_PrefabInstance: {fileID: 0}
2525
m_PrefabAsset: {fileID: 0}
26-
m_GameObject: {fileID: 2290321091419083719}
27-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
28-
m_LocalPosition: {x: 0.16699997, y: -0.11000001, z: 0}
26+
m_GameObject: {fileID: 5164685921297025176}
27+
serializedVersion: 2
28+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
29+
m_LocalPosition: {x: 0, y: 0, z: 0}
2930
m_LocalScale: {x: 1, y: 1, z: 1}
3031
m_ConstrainProportionsScale: 0
3132
m_Children: []
3233
m_Father: {fileID: 0}
33-
m_RootOrder: 0
3434
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35-
--- !u!114 &2290321091419083718
35+
--- !u!114 &338085302890227377
3636
MonoBehaviour:
3737
m_ObjectHideFlags: 0
3838
m_CorrespondingSourceObject: {fileID: 0}
3939
m_PrefabInstance: {fileID: 0}
4040
m_PrefabAsset: {fileID: 0}
41-
m_GameObject: {fileID: 2290321091419083719}
41+
m_GameObject: {fileID: 5164685921297025176}
4242
m_Enabled: 1
4343
m_EditorHideFlags: 0
4444
m_Script: {fileID: 11500000, guid: b69774b53a53ba948b59b4d73ac17c8c, type: 3}
@@ -53,7 +53,7 @@ MonoBehaviour:
5353
RenderSettings:
5454
Pivot:
5555
x: 0.5
56-
y: 0.5
56+
y: 0
5757
Size:
5858
x: 1
5959
y: 1

Assets/Content/Prefabs/Rome/Flag_View.prefab.meta Assets/Content/Prefabs/Rome/Flag.prefab.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Content/Prefabs/Rome/Squad.prefab

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ Transform:
2424
m_PrefabInstance: {fileID: 0}
2525
m_PrefabAsset: {fileID: 0}
2626
m_GameObject: {fileID: 4361557718399854229}
27+
serializedVersion: 2
2728
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
28-
m_LocalPosition: {x: -3.75, y: -0.030000567, z: 0}
29+
m_LocalPosition: {x: 0, y: 0, z: 0}
2930
m_LocalScale: {x: 1, y: 1, z: 1}
3031
m_ConstrainProportionsScale: 0
3132
m_Children: []
3233
m_Father: {fileID: 0}
33-
m_RootOrder: 12
3434
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3535
--- !u!114 &7770257864136128670
3636
MonoBehaviour:

0 commit comments

Comments
 (0)