Assets/Materials/UI/tileTowerVSMat.mat
@@ -40,7 +40,7 @@ m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: 8c9a3d26120e78f40aa4ef9ed23d573c, type: 3} m_Texture: {fileID: 2800000, guid: 93f40a01d57fbff418fc0b54b6ab7d9f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: Assets/Prefabs/Towers/WoodTower/WProjectile_0.prefab
@@ -1464,7 +1464,7 @@ curve: serializedVersion: 2 minMaxState: 0 scalar: 3.4906585 scalar: 8.726646 minScalar: 0.7853982 maxCurve: serializedVersion: 2 Assets/Prefabs/UI/Endless/BottomCanvas.prefab
@@ -419,12 +419,12 @@ m_Children: - {fileID: 4623057513087273498} - {fileID: 4623057512525223247} m_Father: {fileID: 4623057512704841790} m_Father: {fileID: 2459412157512953547} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -3, y: -862} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -3, y: 98} m_SizeDelta: {x: 252, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4623057511312575047 @@ -569,9 +569,9 @@ m_Father: {fileID: 4623057511776897179} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 458, y: 236} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -82, y: 236} m_SizeDelta: {x: 88, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4623057511334348336 @@ -641,13 +641,13 @@ m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4623057512704841790} m_RootOrder: 17 m_Father: {fileID: 2459412157512953547} m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4623057511338059843 CanvasRenderer: @@ -845,12 +845,12 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4623057511420301802} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4623057511488971176} m_Father: {fileID: 4623057512704841790} m_Father: {fileID: 2459412157512953547} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1195,8 +1195,8 @@ m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4623057512704841790} m_RootOrder: 15 m_Father: {fileID: 2459412157512953547} m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1355,9 +1355,9 @@ m_Father: {fileID: 4623057511776897179} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -465, y: -468} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 75, y: 612} m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &4623057511676237799 @@ -1542,13 +1542,13 @@ m_Children: - {fileID: 4623057511676237794} - {fileID: 4623057511334348350} m_Father: {fileID: 4623057512704841790} m_Father: {fileID: 2459412157512953547} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4623057511797355533 GameObject: @@ -1574,12 +1574,11 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4623057511797355533} 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_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4623057512776119513} m_Father: {fileID: 4623057512704841790} m_Children: [] m_Father: {fileID: 2459412157512953547} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1944,12 +1943,12 @@ m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4623057512704841790} m_Father: {fileID: 2459412157512953547} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 459, y: -258.99997} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -81, y: -258.99997} m_SizeDelta: {x: 136, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4623057511951820394 @@ -2487,8 +2486,8 @@ m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4623057512704841790} m_RootOrder: 16 m_Father: {fileID: 2459412157512953547} m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2617,19 +2616,19 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4623057512101065382} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4623057512560611306} - {fileID: 4623057511623356894} - {fileID: 4623057512200465642} m_Father: {fileID: 4623057512704841790} m_Father: {fileID: 2459412157512953547} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 316, y: 903} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 316, y: -57} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4623057512101065368 @@ -2969,8 +2968,8 @@ m_LocalPosition: {x: 0, y: 0, z: -1230.0002} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4623057512704841790} m_RootOrder: 14 m_Father: {fileID: 2459412157512953547} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3626,7 +3625,7 @@ m_LocalPosition: {x: 0, y: 0, z: 0.0004577637} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4623057512704841790} m_Father: {fileID: 2459412157512953547} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -3997,12 +3996,12 @@ m_Children: - {fileID: 4623057512415519653} - {fileID: 4623057512080954351} m_Father: {fileID: 4623057512704841790} m_Father: {fileID: 2459412157512953547} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 292, y: 525} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -248, y: 525} m_SizeDelta: {x: 500, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4623057512704841786 @@ -4036,25 +4035,7 @@ m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 4623057512515962851} - {fileID: 4623057511312575043} - {fileID: 4623057513073301098} - {fileID: 4623057511776897179} - {fileID: 4623057511951820392} - {fileID: 4623057512702542567} - {fileID: 4623057511707873648} - {fileID: 4623057513214273150} - {fileID: 4623057513414159484} - {fileID: 4623057512101065369} - {fileID: 6989462182969459993} - {fileID: 4623057511420301805} - {fileID: 4623057511797355532} - {fileID: 4623057513236082835} - {fileID: 4623057512301994784} - {fileID: 4623057511592347892} - {fileID: 4623057512089794039} - {fileID: 4623057511338059841} - {fileID: 4623057513020863723} - {fileID: 2459412157512953547} - {fileID: 4623057512982295030} m_Father: {fileID: 0} m_RootOrder: 0 @@ -4310,7 +4291,7 @@ m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 m_IsActive: 0 --- !u!224 &4623057512776119513 RectTransform: m_ObjectHideFlags: 0 @@ -4318,17 +4299,17 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4623057512776119526} 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_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4623057511797355532} m_RootOrder: 0 m_Father: {fileID: 2459412157512953547} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 260.09, y: 58.1} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -154, y: -17.400024} m_SizeDelta: {x: 260.08997, y: 58.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4623057512776119515 CanvasRenderer: @@ -4480,7 +4461,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4623057512704841790} m_RootOrder: 19 m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4539,8 +4520,8 @@ - {fileID: 3028643155083363564} - {fileID: 3028643154847299432} - {fileID: 4623057512074301610} m_Father: {fileID: 4623057512704841790} m_RootOrder: 18 m_Father: {fileID: 2459412157512953547} m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4785,12 +4766,12 @@ m_Children: - {fileID: 4623057511285327671} - {fileID: 4623057513050824274} m_Father: {fileID: 4623057512704841790} m_Father: {fileID: 2459412157512953547} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -419, y: -871} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -419, y: 89} m_SizeDelta: {x: 180, y: 40} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4623057513073301100 @@ -4977,16 +4958,16 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4623057513214273151} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} m_Children: [] m_Father: {fileID: 4623057512704841790} m_Father: {fileID: 2459412157512953547} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 619} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -341} m_SizeDelta: {x: 1080, y: 1080} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4623057513214273139 @@ -5107,8 +5088,8 @@ - {fileID: 4623057511554516377} - {fileID: 4623057511856796898} - {fileID: 4623057512663774582} m_Father: {fileID: 4623057512704841790} m_RootOrder: 13 m_Father: {fileID: 2459412157512953547} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5353,8 +5334,8 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4623057513414159485} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4623057511486012572} @@ -5362,12 +5343,12 @@ - {fileID: 4623057513278548000} - {fileID: 4623057513320342619} - {fileID: 4623057511982691805} m_Father: {fileID: 4623057512704841790} m_Father: {fileID: 2459412157512953547} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 22, y: 856} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 22, y: -104} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4623057513414159487 @@ -5389,6 +5370,61 @@ WaveNumText: {fileID: 4623057513320342618} BossInfo: {fileID: 4623057513278548003} HPInfoText: {fileID: 4623057511982691804} --- !u!1 &9176589141210151365 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2459412157512953547} m_Layer: 5 m_Name: Panel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!224 &2459412157512953547 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9176589141210151365} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4623057512515962851} - {fileID: 4623057511312575043} - {fileID: 4623057513073301098} - {fileID: 4623057511776897179} - {fileID: 4623057511951820392} - {fileID: 4623057512702542567} - {fileID: 4623057511707873648} - {fileID: 4623057513214273150} - {fileID: 4623057513414159484} - {fileID: 4623057512101065369} - {fileID: 6989462182969459993} - {fileID: 4623057511420301805} - {fileID: 4623057511797355532} - {fileID: 4623057512776119513} - {fileID: 4623057513236082835} - {fileID: 4623057512301994784} - {fileID: 4623057511592347892} - {fileID: 4623057512089794039} - {fileID: 4623057511338059841} - {fileID: 4623057513020863723} m_Father: {fileID: 4623057512704841790} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &2593358110680681470 PrefabInstance: m_ObjectHideFlags: 0 @@ -5639,15 +5675,15 @@ objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} --- !u!224 &2593358110827121939 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} m_PrefabInstance: {fileID: 4623057511438462799} m_PrefabAsset: {fileID: 0} --- !u!1 &2593358110827121938 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} m_PrefabInstance: {fileID: 4623057511438462799} m_PrefabAsset: {fileID: 0} --- !u!224 &2593358110827121939 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} m_PrefabInstance: {fileID: 4623057511438462799} m_PrefabAsset: {fileID: 0} @@ -5813,7 +5849,7 @@ m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 4623057512704841790} m_TransformParent: {fileID: 2459412157512953547} m_Modifications: - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493, type: 3} @@ -5828,22 +5864,22 @@ - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493, type: 3} propertyPath: m_LocalPosition.z value: -0 value: 0 objectReference: {fileID: 0} - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493, type: 3} propertyPath: m_LocalRotation.x value: 0 value: -0 objectReference: {fileID: 0} - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493, type: 3} propertyPath: m_LocalRotation.y value: 0 value: -0 objectReference: {fileID: 0} - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493, type: 3} propertyPath: m_LocalRotation.z value: 0 value: -0 objectReference: {fileID: 0} - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493, type: 3} @@ -5939,6 +5975,18 @@ objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: edd0f54808263644d9740a9c0040b493, type: 3} --- !u!1 &8424158400893339871 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3801312133014535296, guid: edd0f54808263644d9740a9c0040b493, type: 3} m_PrefabInstance: {fileID: 4623057511554511967} m_PrefabAsset: {fileID: 0} --- !u!224 &6989462182969459993 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493, type: 3} m_PrefabInstance: {fileID: 4623057511554511967} m_PrefabAsset: {fileID: 0} --- !u!114 &1184553460454064981 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5789385329819219722, guid: edd0f54808263644d9740a9c0040b493, @@ -5951,18 +5999,6 @@ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: --- !u!224 &6989462182969459993 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493, type: 3} m_PrefabInstance: {fileID: 4623057511554511967} m_PrefabAsset: {fileID: 0} --- !u!1 &8424158400893339871 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3801312133014535296, guid: edd0f54808263644d9740a9c0040b493, type: 3} m_PrefabInstance: {fileID: 4623057511554511967} m_PrefabAsset: {fileID: 0} --- !u!1001 &4623057511616550406 PrefabInstance: m_ObjectHideFlags: 0 @@ -6390,12 +6426,6 @@ objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 49213eb9f84d76e47b6b19e9a246b83c, type: 3} --- !u!224 &3028643155105321891 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7651475816072793687, guid: 49213eb9f84d76e47b6b19e9a246b83c, type: 3} m_PrefabInstance: {fileID: 4623057511748623860} m_PrefabAsset: {fileID: 0} --- !u!114 &7735723185050839569 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3130750578608519141, guid: 49213eb9f84d76e47b6b19e9a246b83c, @@ -6408,6 +6438,12 @@ m_Script: {fileID: 11500000, guid: 9a92c216c3d4e97459299f45fc451060, type: 3} m_Name: m_EditorClassIdentifier: --- !u!224 &3028643155105321891 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7651475816072793687, guid: 49213eb9f84d76e47b6b19e9a246b83c, type: 3} m_PrefabInstance: {fileID: 4623057511748623860} m_PrefabAsset: {fileID: 0} --- !u!1001 &4623057511883902042 PrefabInstance: m_ObjectHideFlags: 0 @@ -6527,15 +6563,15 @@ objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} --- !u!224 &2593358110207618566 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} m_PrefabInstance: {fileID: 4623057511883902042} m_PrefabAsset: {fileID: 0} --- !u!1 &2593358110207618567 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7193677034299007581, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} m_PrefabInstance: {fileID: 4623057511883902042} m_PrefabAsset: {fileID: 0} --- !u!224 &2593358110207618566 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7193677034299007580, guid: 5bac711eb8890f244b4146b3339516ff, type: 3} m_PrefabInstance: {fileID: 4623057511883902042} m_PrefabAsset: {fileID: 0} @@ -6675,7 +6711,7 @@ m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 4623057512704841790} m_TransformParent: {fileID: 2459412157512953547} m_Modifications: - target: {fileID: 162820266587863500, guid: 550ad0a7c16a47a49bfb36ef49a73a67, type: 3} @@ -6700,17 +6736,17 @@ - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67, type: 3} propertyPath: m_LocalRotation.x value: 0 value: -0 objectReference: {fileID: 0} - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67, type: 3} propertyPath: m_LocalRotation.y value: 0 value: -0 objectReference: {fileID: 0} - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67, type: 3} propertyPath: m_LocalRotation.z value: 0 value: -0 objectReference: {fileID: 0} - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67, type: 3} @@ -6740,12 +6776,12 @@ - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67, type: 3} propertyPath: m_AnchoredPosition.x value: 455 value: -85 objectReference: {fileID: 0} - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67, type: 3} propertyPath: m_AnchoredPosition.y value: -864 value: 96 objectReference: {fileID: 0} - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67, type: 3} @@ -6760,22 +6796,22 @@ - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67, type: 3} propertyPath: m_AnchorMin.x value: 0.5 value: 1 objectReference: {fileID: 0} - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67, type: 3} propertyPath: m_AnchorMin.y value: 0.5 value: 0 objectReference: {fileID: 0} - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67, type: 3} propertyPath: m_AnchorMax.x value: 0.5 value: 1 objectReference: {fileID: 0} - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67, type: 3} propertyPath: m_AnchorMax.y value: 0.5 value: 0 objectReference: {fileID: 0} - target: {fileID: 162820266587863501, guid: 550ad0a7c16a47a49bfb36ef49a73a67, type: 3} Assets/Resources/UI/Endless/Tunel/EndlessFaZhen1.prefab
File was deleted Assets/Resources/UI/Endless/Tunel/EndlessFaZhen11.prefab
New file Diff too large Assets/Resources/UI/Endless/Tunel/EndlessFaZhen11.prefab.metacopy from Assets/Resources/UI/Endless/Tunel/EndlessFaZhen1.prefab.meta copy to Assets/Resources/UI/Endless/Tunel/EndlessFaZhen11.prefab.meta
File was copied from Assets/Resources/UI/Endless/Tunel/EndlessFaZhen1.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: 6257915682fc2c748bde16f06c4f6b56 guid: f4690a2dd6f51cc41b3924a95a3f7a93 PrefabImporter: externalObjects: {} userData: Assets/Resources/UI/Endless/Tunel/EndlessFaZhen2.prefab
File was deleted Assets/Resources/UI/Endless/Tunel/EndlessFaZhen2.prefab.meta
File was deleted Assets/Resources/UI/Endless/Tunel/EndlessFaZhen22.prefab
New file Diff too large Assets/Resources/UI/Endless/Tunel/EndlessFaZhen22.prefab.metacopy from Assets/Resources/UI/Endless/Tunel/EndlessFaZhen1.prefab.meta copy to Assets/Resources/UI/Endless/Tunel/EndlessFaZhen22.prefab.meta
File was copied from Assets/Resources/UI/Endless/Tunel/EndlessFaZhen1.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: 6257915682fc2c748bde16f06c4f6b56 guid: c2c17b17aa96fb9478cb7cf8266ba689 PrefabImporter: externalObjects: {} userData: Assets/Resources/UI/Endless/Tunel/EndlessFaZhen3.prefab
File was deleted Assets/Resources/UI/Endless/Tunel/EndlessFaZhen3.prefab.meta
File was deleted Assets/Resources/UI/Endless/Tunel/EndlessFaZhen33.prefab
New file Diff too large Assets/Resources/UI/Endless/Tunel/EndlessFaZhen33.prefab.metacopy from Assets/Resources/UI/Endless/Tunel/EndlessFaZhen1.prefab.meta copy to Assets/Resources/UI/Endless/Tunel/EndlessFaZhen33.prefab.meta
File was copied from Assets/Resources/UI/Endless/Tunel/EndlessFaZhen1.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: 6257915682fc2c748bde16f06c4f6b56 guid: 9cc5675d5e1433242b10a96a0159bf47 PrefabImporter: externalObjects: {} userData: Assets/Resources/UI/Endless/Tunel/EndlessFaZhen4.prefab
File was deleted Assets/Resources/UI/Endless/Tunel/EndlessFaZhen4.prefab.meta
File was deleted Assets/Resources/UI/Endless/Tunel/EndlessFaZhen44.prefab
New file Diff too large Assets/Resources/UI/Endless/Tunel/EndlessFaZhen44.prefab.meta
File was renamed from Assets/Resources/UI/Endless/Tunel/EndlessFaZhen1.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: 6257915682fc2c748bde16f06c4f6b56 guid: dd63940078791c54a9737177b5863e28 PrefabImporter: externalObjects: {} userData: Assets/Resources/UI/Endless/Tunel/EndlessFaZhen5.prefab
File was deleted Assets/Resources/UI/Endless/Tunel/EndlessFaZhen5.prefab.meta
File was deleted Assets/Resources/UI/Endless/Tunel/EndlessFaZhen55.prefab
New file Diff too large Assets/Resources/UI/Endless/Tunel/EndlessFaZhen55.prefab.metacopy from Assets/Resources/UI/Endless/Tunel/EndlessFaZhen1.prefab.meta copy to Assets/Resources/UI/Endless/Tunel/EndlessFaZhen55.prefab.meta
File was copied from Assets/Resources/UI/Endless/Tunel/EndlessFaZhen1.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 guid: 6257915682fc2c748bde16f06c4f6b56 guid: dfda8c5b6362b8a4b9007d73b878764c PrefabImporter: externalObjects: {} userData: Assets/Scenes/Levels/Battle/Endless2D.unity
@@ -610,6 +610,170 @@ bOpponentSide: 1 areaMesh: {fileID: 122104238} weight: 1 --- !u!43 &115306053 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 firstByte: 0 indexCount: 18 topology: 0 baseVertex: 0 firstVertex: 0 vertexCount: 8 localAABB: m_Center: {x: -0.0000019073486, y: 0, z: -0.0000019073486} m_Extent: {x: 0.5, y: 0, z: 0.5} m_Shapes: vertices: [] shapes: [] channels: [] fullWeights: [] m_BindPose: [] m_BoneNameHashes: m_RootBoneNameHash: 0 m_BonesAABB: [] m_VariableBoneCountWeights: m_Data: m_MeshCompression: 0 m_IsReadable: 1 m_KeepVertices: 1 m_KeepIndices: 1 m_IndexFormat: 0 m_IndexBuffer: 070005000300030001000700070006000500050004000300030002000100010000000700 m_VertexData: serializedVersion: 3 m_VertexCount: 8 m_Channels: - stream: 0 offset: 0 format: 0 dimension: 3 - stream: 0 offset: 12 format: 0 dimension: 3 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 m_DataSize: 192 _typelessdata: c004b53e000000004005b5be00000000ffff7f3f00000000c0ffff3e00000000000000b600000000ffff7f3f00000000c004b53e00000000c004b53e00000000ffff7f3f00000000000000b600000000c0ffff3e000000000000803f000000000005b5be000000008004b53e000000000000803f00000000200000bf00000000000000b600000000ffff7f3f000000000005b5be000000008005b5be00000000ffff7f3f00000000000000b600000000200000bf000000000000803f00000000 m_CompressedMesh: m_Vertices: m_NumItems: 0 m_Range: 0 m_Start: 0 m_Data: m_BitSize: 0 m_UV: m_NumItems: 0 m_Range: 0 m_Start: 0 m_Data: m_BitSize: 0 m_Normals: m_NumItems: 0 m_Range: 0 m_Start: 0 m_Data: m_BitSize: 0 m_Tangents: m_NumItems: 0 m_Range: 0 m_Start: 0 m_Data: m_BitSize: 0 m_Weights: m_NumItems: 0 m_Data: m_BitSize: 0 m_NormalSigns: m_NumItems: 0 m_Data: m_BitSize: 0 m_TangentSigns: m_NumItems: 0 m_Data: m_BitSize: 0 m_FloatColors: m_NumItems: 0 m_Range: 0 m_Start: 0 m_Data: m_BitSize: 0 m_BoneIndices: m_NumItems: 0 m_Data: m_BitSize: 0 m_Triangles: m_NumItems: 0 m_Data: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: m_Center: {x: -0.0000019073486, y: 0, z: -0.0000019073486} m_Extent: {x: 0.5, y: 0, z: 0.5} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshMetrics[0]: 1 m_MeshMetrics[1]: 1 m_MeshOptimizationFlags: 1 m_StreamData: serializedVersion: 2 offset: 0 size: 0 path: --- !u!1 &122104235 GameObject: m_ObjectHideFlags: 0 @@ -1423,7 +1587,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 236991184} m_Mesh: {fileID: 0} m_Mesh: {fileID: 1650163607} --- !u!114 &236991187 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3991,7 +4155,7 @@ - target: {fileID: 4623057512524248738, guid: 29da21b318f42054db30c52123aa4dbf, type: 3} propertyPath: m_AnchoredPosition.y value: -0.000061035156 value: -0.0040893555 objectReference: {fileID: 0} - target: {fileID: 4623057512704841786, guid: 29da21b318f42054db30c52123aa4dbf, type: 3} @@ -5618,7 +5782,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1181846405} m_Mesh: {fileID: 0} m_Mesh: {fileID: 115306053} --- !u!114 &1181846408 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5633,31 +5797,31 @@ m_EditorClassIdentifier: meshObject: triangles: - v0: {x: -0.00000055134296, y: 0, z: -0.5000015} v1: {x: -0.50000066, y: 0, z: -0.0000011399388} v2: {x: -0.0000010877848, y: 0, z: 0.49999633} area: 0.24999934 - v0: {x: -0.0000010877848, y: 0, z: 0.49999633} v1: {x: 0.49999723, y: 0, z: -0.000000603497} v2: {x: -0.00000055134296, y: 0, z: -0.5000015} area: 0.24999852 - v0: {x: -0.00000055134296, y: 0, z: -0.5000015} v1: {x: -0.35355467, y: 0, z: -0.35355723} v2: {x: -0.50000066, y: 0, z: -0.0000011399388} area: 0.0517775 - v0: {x: -0.50000066, y: 0, z: -0.0000011399388} v1: {x: -0.3535546, y: 0, z: 0.35354957} v2: {x: -0.0000010877848, y: 0, z: 0.49999633} area: 0.051776305 - v0: {x: -0.0000010877848, y: 0, z: 0.49999633} v1: {x: 0.35355303, y: 0, z: 0.3535521} v2: {x: 0.49999723, y: 0, z: -0.000000603497} area: 0.051777046 - v0: {x: 0.49999723, y: 0, z: -0.000000603497} v1: {x: 0.35355127, y: 0, z: -0.3535556} v2: {x: -0.00000055134296, y: 0, z: -0.5000015} area: 0.05177676 completeArea: 0.70710546 - v0: {x: -0.0000019073486, y: 0, z: -0.5000019} v1: {x: -0.5000019, y: 0, z: -0.0000019073486} v2: {x: -0.0000019073486, y: 0, z: 0.4999981} area: 0.25000006 - v0: {x: -0.0000019073486, y: 0, z: 0.4999981} v1: {x: 0.4999981, y: 0, z: -0.0000019073486} v2: {x: -0.0000019073486, y: 0, z: -0.5000019} area: 0.25000006 - v0: {x: -0.0000019073486, y: 0, z: -0.5000019} v1: {x: -0.35355377, y: 0, z: -0.3535576} v2: {x: -0.5000019, y: 0, z: -0.0000019073486} area: 0.051776916 - v0: {x: -0.5000019, y: 0, z: -0.0000019073486} v1: {x: -0.35355377, y: 0, z: 0.35354996} v2: {x: -0.0000019073486, y: 0, z: 0.4999981} area: 0.05177592 - v0: {x: -0.0000019073486, y: 0, z: 0.4999981} v1: {x: 0.35355186, y: 0, z: 0.35355186} v2: {x: 0.4999981, y: 0, z: -0.0000019073486} area: 0.05177692 - v0: {x: 0.4999981, y: 0, z: -0.0000019073486} v1: {x: 0.35355186, y: 0, z: -0.35355568} v2: {x: -0.0000019073486, y: 0, z: -0.5000019} area: 0.05177692 completeArea: 0.70710677 outSidePointsParent: {fileID: 1466089839} --- !u!1 &1218207756 GameObject: @@ -7798,6 +7962,170 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1643240603} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!43 &1650163607 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 firstByte: 0 indexCount: 18 topology: 0 baseVertex: 0 firstVertex: 0 vertexCount: 8 localAABB: m_Center: {x: 0.02170062, y: 0, z: -0.021128714} m_Extent: {x: 0.61757374, y: 0, z: 0.5453415} m_Shapes: vertices: [] shapes: [] channels: [] fullWeights: [] m_BindPose: [] m_BoneNameHashes: m_RootBoneNameHash: 0 m_BonesAABB: [] m_VariableBoneCountWeights: m_Data: m_MeshCompression: 0 m_IsReadable: 1 m_KeepVertices: 1 m_KeepIndices: 1 m_IndexFormat: 0 m_IndexBuffer: 070005000300030001000700070006000500050004000300030002000100010000000700 m_VertexData: serializedVersion: 3 m_VertexCount: 8 m_Channels: - stream: 0 offset: 0 format: 0 dimension: 3 - stream: 0 offset: 12 format: 0 dimension: 3 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 - stream: 0 offset: 0 format: 0 dimension: 0 m_DataSize: 192 _typelessdata: 8875f4be000000006144e0be000000000000803f000000000ac75d3c00000000310411bf000000000000803f00000000f893f73e0000000061e8b9be000000000000803f000000007ca7233f00000000289c6fbc000000000000803f0000000038dad03e000000009fc9b33e000000000000803f00000000c233273d00000000cf32063f000000000000803f000000004893cebe000000001f7ed03e000000000000803f00000000248b18bf000000005058a3bb00000000ffff7f3f00000000 m_CompressedMesh: m_Vertices: m_NumItems: 0 m_Range: 0 m_Start: 0 m_Data: m_BitSize: 0 m_UV: m_NumItems: 0 m_Range: 0 m_Start: 0 m_Data: m_BitSize: 0 m_Normals: m_NumItems: 0 m_Range: 0 m_Start: 0 m_Data: m_BitSize: 0 m_Tangents: m_NumItems: 0 m_Range: 0 m_Start: 0 m_Data: m_BitSize: 0 m_Weights: m_NumItems: 0 m_Data: m_BitSize: 0 m_NormalSigns: m_NumItems: 0 m_Data: m_BitSize: 0 m_TangentSigns: m_NumItems: 0 m_Data: m_BitSize: 0 m_FloatColors: m_NumItems: 0 m_Range: 0 m_Start: 0 m_Data: m_BitSize: 0 m_BoneIndices: m_NumItems: 0 m_Data: m_BitSize: 0 m_Triangles: m_NumItems: 0 m_Data: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: m_Center: {x: 0.02170062, y: 0, z: -0.021128714} m_Extent: {x: 0.61757374, y: 0, z: 0.5453415} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: m_MeshMetrics[0]: 1 m_MeshMetrics[1]: 1 m_MeshOptimizationFlags: 1 m_StreamData: serializedVersion: 2 offset: 0 size: 0 path: --- !u!1 &1660142624 GameObject: m_ObjectHideFlags: 0 Assets/Scenes/LoadingScene.unity
@@ -153,7 +153,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2142699187} m_RootOrder: 6 m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -243,7 +243,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &494017137 GameObject: @@ -270,17 +270,17 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 494017137} 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_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2142699187} m_Father: {fileID: 501810474} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1080, y: 1920} m_SizeDelta: {x: 1080, y: 2288} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &494017139 MonoBehaviour: @@ -302,7 +302,7 @@ m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: e187cb70474cf834fb08574deefcb084, type: 3} m_Sprite: {fileID: 21300000, guid: d92d2a99b7830234da2e494f43c6d7f2, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -411,9 +411,10 @@ m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 494017138} - {fileID: 2142699187} m_Father: {fileID: 0} m_RootOrder: 4 m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -466,7 +467,7 @@ - {fileID: 1638253221} - {fileID: 1773889116} m_Father: {fileID: 2142699187} m_RootOrder: 10 m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -540,7 +541,7 @@ m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 m_IsActive: 1 --- !u!224 &809190790 RectTransform: m_ObjectHideFlags: 0 @@ -553,7 +554,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2142699187} m_RootOrder: 2 m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -598,75 +599,6 @@ m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 809190789} m_CullTransparentMesh: 0 --- !u!1001 &826703610 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3} propertyPath: m_LocalPosition.x value: 1417 objectReference: {fileID: 0} - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3} propertyPath: m_LocalPosition.y value: 940 objectReference: {fileID: 0} - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - target: {fileID: 3091314759354326715, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - target: {fileID: 3091314759354326717, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3} propertyPath: m_Name value: ClearCamera objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3} --- !u!1 &901340337 GameObject: m_ObjectHideFlags: 0 @@ -757,7 +689,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &1234802519 GameObject: @@ -789,7 +721,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2142699187} m_RootOrder: 8 m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -869,7 +801,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2142699187} m_RootOrder: 5 m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1021,7 +953,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1592474032 GameObject: @@ -1040,7 +972,7 @@ m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 m_IsActive: 1 --- !u!224 &1592474033 RectTransform: m_ObjectHideFlags: 0 @@ -1053,7 +985,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2142699187} m_RootOrder: 1 m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1283,8 +1215,8 @@ m_GameObject: {fileID: 1738527247} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_ClearFlags: 2 m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -1329,7 +1261,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1761314359 GameObject: @@ -1362,7 +1294,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2142699187} m_RootOrder: 4 m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1517,7 +1449,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2142699187} m_RootOrder: 9 m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1635,7 +1567,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2142699187} m_RootOrder: 7 m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1701,7 +1633,7 @@ m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 m_IsActive: 1 --- !u!224 &2019853796 RectTransform: m_ObjectHideFlags: 0 @@ -1714,7 +1646,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2142699187} m_RootOrder: 3 m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1788,7 +1720,6 @@ m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 494017138} - {fileID: 1592474033} - {fileID: 809190790} - {fileID: 2019853796} @@ -1800,12 +1731,12 @@ - {fileID: 1970259399} - {fileID: 707747089} m_Father: {fileID: 501810474} m_RootOrder: 0 m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1080, y: 1920} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2142699188 MonoBehaviour: Assets/Scripts/Event/EventType.cs
@@ -81,6 +81,8 @@ EndlessOneTimeKillCount, // 无尽模式buff刷新 EndlessBuffRefresh, //某一列出怪完毕 WaveLineFinish, } } Assets/Scripts/Guide/GuidePanel.cs
@@ -63,7 +63,7 @@ tmpMask.enabled = false; backgroundImg = transform.Find("Button").GetComponent<Image>(); towerBuyBtn = GameObject.Find("BottomCanvas/TowerBuyBtn"); towerBuyBtn = GameObject.Find("UICamera/BottomCanvas/Panel/TowerBuyBtn"); tipsUI = transform.Find("Tips").gameObject; tipsUI.transform.SetAsLastSibling();//把tips放在最下面 Assets/Scripts/TowerDefense/Level/EndlessWave.cs
@@ -98,6 +98,8 @@ { StopTimer(spawnTimer); isWaveStoped = true; //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.WaveLineFinish,WaveLineId); } public void PauseWave() Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
@@ -102,10 +102,19 @@ private Timer faZhenRefreshTimer; /// <summary> /// 管理法阵的对象池 /// </summary> /// <returns></returns> private Dictionary<string, List<GameObject>> faZhenDic = new Dictionary<string, List<GameObject>>(); private void Start() { faZhenDic = new Dictionary<string, List<GameObject>>(); HideTunel(); EventCenter.Ins.Add<float>((int)KTGMGemClient.EventType.EndlessAgentTaskDamage, OnHit); EventCenter.Ins.Add<int>((int)KTGMGemClient.EventType.WaveLineFinish, WaveLineFinish); } /// <summary> @@ -220,8 +229,38 @@ int tunel = waveData[i].Config.tunel; int tunelBgId = waveData[i].Config.tunel_bg; // string key = $"{faZhenPath}{tunelBgId}{tunelBgId}"; // List<GameObject> allPS; // GameObject tmpPSObj = null; // if (faZhenDic.ContainsKey(key)) // { // allPS = faZhenDic[key]; // foreach (GameObject item in allPS) // { // if (item.activeSelf) // { // tmpPSObj = item; // break; // } // } // } // if (tmpPSObj == null) // { // allPS = new List<GameObject>(); // GameObject obj = Resources.Load<GameObject>($"{faZhenPath}{tunelBgId}{tunelBgId}"); // GameObject faZhen = Instantiate(obj); // tmpPSObj = faZhen; // allPS.Add(faZhen); // faZhenDic.Add(key, allPS); // } // tmpPSObj.transform.SetParent(TunelList[tunel - 1].gameObject.transform); // tmpPSObj.transform.localPosition = new Vector3(0, 1, 0); // tmpPSObj.transform.localScale = new Vector3(2, 2, 2); // TunelList[tunel - 1].gameObject.SetActive(true); TunelList[tunel - 1].material = Resources.Load<Material>($"{tunelMaterialPath}{tunelBgId}"); GameObject obj = Resources.Load<GameObject>($"{faZhenPath}{tunelBgId}"); GameObject obj = Resources.Load<GameObject>($"{faZhenPath}{tunelBgId}{tunelBgId}"); GameObject faZhen = Instantiate(obj); faZhen.transform.SetParent(TunelList[tunel - 1].gameObject.transform); @@ -240,6 +279,23 @@ } /// <summary> /// 延迟关闭法阵 /// </summary> /// <param name="WaveLineId"></param> private void WaveLineFinish(int WaveLineId) { //StartCoroutine(CloseFaZhen(WaveLineId)); } IEnumerator CloseFaZhen(int WaveLineId) { yield return new WaitForSeconds(1.0f); Debug.Log("当前列出怪完成,WaveLineId:" + WaveLineId); TunelList[WaveLineId - 1].gameObject.SetActive(false); } /// <summary> /// 敌人数量减少 /// </summary> /// <param name="count"></param> Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs
@@ -78,11 +78,11 @@ if (EndlessGameUI.instance.state == EndlessGameUI.State.Building) EndlessGameUI.instance.CancelGhostPlacement(); GameObject go = Instantiate(Resources.Load<GameObject>("UI/Final/FinalPanel"), GameObject.Find("MainUI").transform); GameObject go = Instantiate(Resources.Load<GameObject>("UI/Final/FinalPanel"), GameObject.Find("UICamera/MainUI").transform); FinalPanel panelUI = go.GetComponent<FinalPanel>(); panelUI.SetData($"成绩 {EndlessLevelManager.instance.CurrentLevel}关 {EndlessLevelManager.instance.WaveManager.CurrentWaveIndex}波", EndlessScoreData.CurrentSocre); panelUI.SetPlayEffectAC(PlayEffect); GameObject.Find("BottomCanvas").GetComponent<Canvas>().enabled = false; GameObject.Find("UICamera/BottomCanvas").GetComponent<Canvas>().enabled = false; return; RefreshFinalWave(); @@ -118,7 +118,7 @@ if (showFavorite == 0) { GameObject go = Instantiate(Resources.Load<GameObject>("UI/Favorite/FavoritePanel"), this.transform.root); GameObject go = Instantiate(Resources.Load<GameObject>("UI/Favorite/FavoritePanel"), this.transform.parent.parent); FavoritePanelUI panelUI = go.GetComponent<FavoritePanelUI>(); panelUI.SetAC(ShowPanel); Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
@@ -2093,11 +2093,12 @@ { base.Awake(); randomTowerBtn = transform.Find("BottomCanvas/TowerBuyBtn").GetComponent<Button>(); randomTowerBtn = transform.Find("BottomCanvas/Panel/TowerBuyBtn").GetComponent<Button>(); DOTween.Init(true, true, LogBehaviour.Verbose).SetCapacity(200, 10); state = State.Normal; m_Camera = GameObject.Find("SceneCamera3D").GetComponent<Camera>(); //m_Camera = GetComponent<Camera>(); TowerDestroyArr = new bool[5, AttackRowNumbers]; } Assets/UI/Loading/Lark20201116-100920.png
Assets/UI/Loading/Lark20201116-100920.png.meta
New file @@ -0,0 +1,118 @@ fileFormatVersion: 2 guid: d92d2a99b7830234da2e494f43c6d7f2 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: convertToNormalMap: 0 externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 textureFormat: 1 maxTextureSize: 2048 textureSettings: serializedVersion: 2 filterMode: -1 aniso: -1 mipBias: -100 wrapU: 1 wrapV: 1 wrapW: -1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 1 spriteExtrude: 0 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 8192 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 8192 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android maxTextureSize: 8192 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: edges: [] weights: [] secondaryTextures: [] spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: