little refactor

This commit is contained in:
2016-12-11 13:32:21 +07:00
parent d74728b4df
commit 8cff61ae91
21 changed files with 1447 additions and 448 deletions

View File

@@ -5,10 +5,10 @@ GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4 serializedVersion: 5
m_Component: m_Component:
- 4: {fileID: 490734} - component: {fileID: 490734}
- 212: {fileID: 21210794} - component: {fileID: 21210794}
m_Layer: 0 m_Layer: 0
m_Name: New Sprite m_Name: New Sprite
m_TagString: Untagged m_TagString: Untagged
@@ -21,10 +21,10 @@ GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4 serializedVersion: 5
m_Component: m_Component:
- 4: {fileID: 417424} - component: {fileID: 417424}
- 114: {fileID: 11472392} - component: {fileID: 11472392}
m_Layer: 0 m_Layer: 0
m_Name: TileA m_Name: TileA
m_TagString: Untagged m_TagString: Untagged
@@ -41,11 +41,11 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.2000008, y: -3.3, z: 1.3000001} m_LocalPosition: {x: 2.2000008, y: -3.3, z: 1.3000001}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: m_Children:
- {fileID: 490734} - {fileID: 490734}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &490734 --- !u!4 &490734
Transform: Transform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -55,10 +55,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.011, y: 1.85, z: 0} m_LocalPosition: {x: 0.011, y: 1.85, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: [] m_Children: []
m_Father: {fileID: 417424} m_Father: {fileID: 417424}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11472392 --- !u!114 &11472392
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -89,7 +89,9 @@ SpriteRenderer:
m_ReflectionProbeUsage: 0 m_ReflectionProbeUsage: 0
m_Materials: m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices: m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0} m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0}
@@ -97,7 +99,7 @@ SpriteRenderer:
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedWireframeHidden: 1 m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

File diff suppressed because it is too large Load Diff

View File

@@ -5,11 +5,11 @@ GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4 serializedVersion: 5
m_Component: m_Component:
- 4: {fileID: 417528} - component: {fileID: 417528}
- 212: {fileID: 21217528} - component: {fileID: 21217528}
- 114: {fileID: 11417528} - component: {fileID: 11417528}
m_Layer: 0 m_Layer: 0
m_Name: Cube_1x1x1 m_Name: Cube_1x1x1
m_TagString: Untagged m_TagString: Untagged
@@ -26,10 +26,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11417528 --- !u!114 &11417528
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -60,7 +60,9 @@ SpriteRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_Materials: m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices: m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0} m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0}
@@ -68,7 +70,7 @@ SpriteRenderer:
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedWireframeHidden: 1 m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

View File

@@ -5,11 +5,11 @@ GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4 serializedVersion: 5
m_Component: m_Component:
- 4: {fileID: 463702} - component: {fileID: 463702}
- 212: {fileID: 21263702} - component: {fileID: 21263702}
- 114: {fileID: 11463702} - component: {fileID: 11463702}
m_Layer: 0 m_Layer: 0
m_Name: Cube_1x1x3 m_Name: Cube_1x1x3
m_TagString: Untagged m_TagString: Untagged
@@ -26,10 +26,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11463702 --- !u!114 &11463702
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -60,7 +60,9 @@ SpriteRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_Materials: m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices: m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0} m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0}
@@ -68,7 +70,7 @@ SpriteRenderer:
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedWireframeHidden: 1 m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

View File

@@ -5,11 +5,11 @@ GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4 serializedVersion: 5
m_Component: m_Component:
- 4: {fileID: 453620} - component: {fileID: 453620}
- 212: {fileID: 21253620} - component: {fileID: 21253620}
- 114: {fileID: 11453620} - component: {fileID: 11453620}
m_Layer: 0 m_Layer: 0
m_Name: Cube_1x3x1 m_Name: Cube_1x3x1
m_TagString: Untagged m_TagString: Untagged
@@ -26,10 +26,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11453620 --- !u!114 &11453620
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -60,7 +60,9 @@ SpriteRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_Materials: m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices: m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0} m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0}
@@ -68,7 +70,7 @@ SpriteRenderer:
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedWireframeHidden: 1 m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

View File

@@ -5,11 +5,11 @@ GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4 serializedVersion: 5
m_Component: m_Component:
- 4: {fileID: 462204} - component: {fileID: 462204}
- 212: {fileID: 21262204} - component: {fileID: 21262204}
- 114: {fileID: 11462204} - component: {fileID: 11462204}
m_Layer: 0 m_Layer: 0
m_Name: Cube_3x1x1 m_Name: Cube_3x1x1
m_TagString: Untagged m_TagString: Untagged
@@ -26,10 +26,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11462204 --- !u!114 &11462204
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -60,7 +60,9 @@ SpriteRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_Materials: m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices: m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0} m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0}
@@ -68,7 +70,7 @@ SpriteRenderer:
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedWireframeHidden: 1 m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

View File

@@ -5,11 +5,11 @@ GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4 serializedVersion: 5
m_Component: m_Component:
- 4: {fileID: 418276} - component: {fileID: 418276}
- 212: {fileID: 21218276} - component: {fileID: 21218276}
- 114: {fileID: 11418276} - component: {fileID: 11418276}
m_Layer: 0 m_Layer: 0
m_Name: Floor m_Name: Floor
m_TagString: Untagged m_TagString: Untagged
@@ -29,6 +29,7 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11418276 --- !u!114 &11418276
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -44,7 +45,6 @@ MonoBehaviour:
_position: {x: 0, y: 0, z: 0} _position: {x: 0, y: 0, z: 0}
_mode: 0 _mode: 0
_cacheRenderers: 1 _cacheRenderers: 1
_isAlignment: 1
_isShowBounds: 0 _isShowBounds: 0
--- !u!212 &21218276 --- !u!212 &21218276
SpriteRenderer: SpriteRenderer:
@@ -55,17 +55,22 @@ SpriteRenderer:
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_Materials: m_MotionVectors: 1
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} m_LightProbeUsage: 0
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1 m_ScaleInLightmap: 1
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

View File

@@ -5,11 +5,11 @@ GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4 serializedVersion: 5
m_Component: m_Component:
- 4: {fileID: 453404} - component: {fileID: 453404}
- 212: {fileID: 21253404} - component: {fileID: 21253404}
- 114: {fileID: 11453404} - component: {fileID: 11453404}
m_Layer: 0 m_Layer: 0
m_Name: Floor_3x3 m_Name: Floor_3x3
m_TagString: Untagged m_TagString: Untagged
@@ -26,10 +26,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11453404 --- !u!114 &11453404
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -60,7 +60,9 @@ SpriteRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_Materials: m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices: m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0} m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0}
@@ -68,7 +70,7 @@ SpriteRenderer:
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedWireframeHidden: 1 m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

File diff suppressed because it is too large Load Diff

View File

@@ -5,11 +5,11 @@ GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4 serializedVersion: 5
m_Component: m_Component:
- 4: {fileID: 424368} - component: {fileID: 424368}
- 212: {fileID: 21224368} - component: {fileID: 21224368}
- 114: {fileID: 11424368} - component: {fileID: 11424368}
m_Layer: 0 m_Layer: 0
m_Name: Wall_l m_Name: Wall_l
m_TagString: Untagged m_TagString: Untagged
@@ -29,6 +29,7 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11424368 --- !u!114 &11424368
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -44,7 +45,6 @@ MonoBehaviour:
_position: {x: 0, y: 0, z: 0} _position: {x: 0, y: 0, z: 0}
_mode: 0 _mode: 0
_cacheRenderers: 1 _cacheRenderers: 1
_isAlignment: 1
_isShowBounds: 0 _isShowBounds: 0
--- !u!212 &21224368 --- !u!212 &21224368
SpriteRenderer: SpriteRenderer:
@@ -55,17 +55,22 @@ SpriteRenderer:
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_Materials: m_MotionVectors: 1
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} m_LightProbeUsage: 0
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1 m_ScaleInLightmap: 1
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

View File

@@ -5,11 +5,11 @@ GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4 serializedVersion: 5
m_Component: m_Component:
- 4: {fileID: 490292} - component: {fileID: 490292}
- 212: {fileID: 21290292} - component: {fileID: 21290292}
- 114: {fileID: 11490292} - component: {fileID: 11490292}
m_Layer: 0 m_Layer: 0
m_Name: Wall_r m_Name: Wall_r
m_TagString: Untagged m_TagString: Untagged
@@ -29,6 +29,7 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11490292 --- !u!114 &11490292
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -44,7 +45,6 @@ MonoBehaviour:
_position: {x: 0, y: 0, z: 0} _position: {x: 0, y: 0, z: 0}
_mode: 0 _mode: 0
_cacheRenderers: 1 _cacheRenderers: 1
_isAlignment: 1
_isShowBounds: 0 _isShowBounds: 0
--- !u!212 &21290292 --- !u!212 &21290292
SpriteRenderer: SpriteRenderer:
@@ -55,17 +55,22 @@ SpriteRenderer:
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_Materials: m_MotionVectors: 1
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} m_LightProbeUsage: 0
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1 m_ScaleInLightmap: 1
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

View File

@@ -5,11 +5,11 @@ GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4 serializedVersion: 5
m_Component: m_Component:
- 4: {fileID: 473450} - component: {fileID: 473450}
- 212: {fileID: 21273450} - component: {fileID: 21273450}
- 114: {fileID: 11473450} - component: {fileID: 11473450}
m_Layer: 0 m_Layer: 0
m_Name: Wallx3_l m_Name: Wallx3_l
m_TagString: Untagged m_TagString: Untagged
@@ -29,6 +29,7 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11473450 --- !u!114 &11473450
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -44,7 +45,6 @@ MonoBehaviour:
_position: {x: -0, y: 0, z: 0} _position: {x: -0, y: 0, z: 0}
_mode: 0 _mode: 0
_cacheRenderers: 1 _cacheRenderers: 1
_isAlignment: 1
_isShowBounds: 0 _isShowBounds: 0
--- !u!212 &21273450 --- !u!212 &21273450
SpriteRenderer: SpriteRenderer:
@@ -55,17 +55,22 @@ SpriteRenderer:
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_Materials: m_MotionVectors: 1
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} m_LightProbeUsage: 0
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1 m_ScaleInLightmap: 1
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

View File

@@ -5,11 +5,11 @@ GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4 serializedVersion: 5
m_Component: m_Component:
- 4: {fileID: 412568} - component: {fileID: 412568}
- 212: {fileID: 21212568} - component: {fileID: 21212568}
- 114: {fileID: 11412568} - component: {fileID: 11412568}
m_Layer: 0 m_Layer: 0
m_Name: Wallx3_r m_Name: Wallx3_r
m_TagString: Untagged m_TagString: Untagged
@@ -29,6 +29,7 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11412568 --- !u!114 &11412568
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
@@ -44,7 +45,6 @@ MonoBehaviour:
_position: {x: 0, y: 0, z: 0} _position: {x: 0, y: 0, z: 0}
_mode: 0 _mode: 0
_cacheRenderers: 1 _cacheRenderers: 1
_isAlignment: 1
_isShowBounds: 0 _isShowBounds: 0
--- !u!212 &21212568 --- !u!212 &21212568
SpriteRenderer: SpriteRenderer:
@@ -55,17 +55,22 @@ SpriteRenderer:
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_Materials: m_MotionVectors: 1
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} m_LightProbeUsage: 0
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1 m_ScaleInLightmap: 1
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4 m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89

View File

@@ -42,7 +42,7 @@ namespace IsoTools.Internal {
return false; return false;
} }
_dict.Add(item, _list.Count); _dict.Add(item, _list.Count);
_list.Push(item); _list.Add(item);
return true; return true;
} }
@@ -60,6 +60,12 @@ namespace IsoTools.Internal {
return false; return false;
} }
public T Pop() {
var item = _list.Pop();
_dict.Remove(item);
return item;
}
public void Clear() { public void Clear() {
_list.Clear(); _list.Clear();
_dict.Clear(); _dict.Clear();

View File

@@ -26,7 +26,7 @@ namespace IsoTools.Internal {
} }
} }
public void Push(T value) { public void Add(T value) {
if ( _size == _data.Length ) { if ( _size == _data.Length ) {
var new_capacity = _size == 0 var new_capacity = _size == 0
? _defaultCapacity : _size * 2; ? _defaultCapacity : _size * 2;

View File

@@ -1,6 +1,4 @@
using System; namespace IsoTools.Internal {
namespace IsoTools.Internal {
public interface IsoIPool<T> { public interface IsoIPool<T> {
T Take(); T Take();
void Release(T item); void Release(T item);
@@ -12,7 +10,7 @@ namespace IsoTools.Internal {
public IsoPool(int capacity) { public IsoPool(int capacity) {
_items = new IsoList<T>(capacity); _items = new IsoList<T>(capacity);
for ( var i = 0; i < capacity; ++i ) { for ( var i = 0; i < capacity; ++i ) {
_items.Push(CreateItem()); _items.Add(CreateItem());
} }
} }
@@ -23,11 +21,8 @@ namespace IsoTools.Internal {
} }
public void Release(T item) { public void Release(T item) {
if ( item == null ) {
throw new ArgumentNullException("item");
}
CleanUpItem(item); CleanUpItem(item);
_items.Push(item); _items.Add(item);
} }
public abstract T CreateItem(); public abstract T CreateItem();

View File

@@ -562,7 +562,7 @@ namespace IsoTools {
_sectors.Capacity = count; _sectors.Capacity = count;
} }
while ( _sectors.Count < _sectors.Capacity ) { while ( _sectors.Count < _sectors.Capacity ) {
_sectors.Push(new Sector()); _sectors.Add(new Sector());
} }
} }
for ( int i = 0, e = _sectors.Count; i < e; ++i ) { for ( int i = 0, e = _sectors.Count; i < e; ++i ) {
@@ -581,7 +581,7 @@ namespace IsoTools {
for ( var x = min.x; x < max.x; ++x ) { for ( var x = min.x; x < max.x; ++x ) {
var sector = FindSector(x, y); var sector = FindSector(x, y);
if ( sector != null ) { if ( sector != null ) {
sector.objects.Push(iso_object); sector.objects.Add(iso_object);
} }
}} }}
} }

View File

@@ -3,7 +3,7 @@
--- !u!30 &1 --- !u!30 &1
GraphicsSettings: GraphicsSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 7 serializedVersion: 9
m_Deferred: m_Deferred:
m_Mode: 1 m_Mode: 1
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -38,22 +38,18 @@ GraphicsSettings:
m_PreloadedShaders: [] m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0} type: 0}
m_ShaderSettings_Tier1: m_TierSettings_Tier1:
renderingPath: 1
useCascadedShadowMaps: 1 useCascadedShadowMaps: 1
standardShaderQuality: 2 m_TierSettings_Tier2:
useReflectionProbeBoxProjection: 1 renderingPath: 1
useReflectionProbeBlending: 1
m_ShaderSettings_Tier2:
useCascadedShadowMaps: 1 useCascadedShadowMaps: 1
standardShaderQuality: 2 m_TierSettings_Tier3:
useReflectionProbeBoxProjection: 1 renderingPath: 1
useReflectionProbeBlending: 1
m_ShaderSettings_Tier3:
useCascadedShadowMaps: 1 useCascadedShadowMaps: 1
standardShaderQuality: 2 m_DefaultRenderingPath: 1
useReflectionProbeBoxProjection: 1 m_DefaultMobileRenderingPath: 1
useReflectionProbeBlending: 1 m_TierSettings: []
m_BuildTargetShaderSettings: []
m_LightmapStripping: 0 m_LightmapStripping: 0
m_FogStripping: 0 m_FogStripping: 0
m_LightmapKeepPlain: 1 m_LightmapKeepPlain: 1

View File

@@ -1,2 +1 @@
m_EditorVersion: 5.4.2f2 m_EditorVersion: 5.5.0f3
m_StandardAssetsVersion: 0

View File

@@ -1,11 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!292 &1
UnityAdsSettings:
m_ObjectHideFlags: 0
m_Enabled: 0
m_InitializeOnStartup: 1
m_TestMode: 0
m_EnabledPlatforms: 4294967295
m_IosGameId:
m_AndroidGameId:

View File

@@ -3,6 +3,14 @@
--- !u!310 &1 --- !u!310 &1
UnityConnectSettings: UnityConnectSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_Enabled: 0
m_TestMode: 0
m_TestEventUrl:
m_TestConfigUrl:
CrashReportingSettings:
m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
m_Enabled: 0
m_CaptureEditorExceptions: 1
UnityPurchasingSettings: UnityPurchasingSettings:
m_Enabled: 0 m_Enabled: 0
m_TestMode: 0 m_TestMode: 0
@@ -12,3 +20,10 @@ UnityConnectSettings:
m_TestMode: 0 m_TestMode: 0
m_TestEventUrl: m_TestEventUrl:
m_TestConfigUrl: m_TestConfigUrl:
UnityAdsSettings:
m_Enabled: 0
m_InitializeOnStartup: 1
m_TestMode: 0
m_EnabledPlatforms: 4294967295
m_IosGameId:
m_AndroidGameId: