diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01-Legendary.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01-Legendary.prefab index dccd5f2d..a75c0260 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01-Legendary.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01-Legendary.prefab @@ -562,6 +562,8 @@ MonoBehaviour: cardIndex: 0 cardDescription: {fileID: 4157078162787977941} cardName: {fileID: 6020088242945090177} + cardType: {fileID: 0} + cardTypeImage: {fileID: 0} cardImage: {fileID: 2030393732758620615} midBorder: {fileID: 3095710138702975603} topBorder: {fileID: 3893753280325337861} @@ -571,6 +573,8 @@ MonoBehaviour: canUse: 1 smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db, type: 3} + noSmallCard: 0 + noSyncText: 0 --- !u!114 &5545682449418996990 MonoBehaviour: m_ObjectHideFlags: 0 @@ -737,8 +741,8 @@ RectTransform: m_GameObject: {fileID: 5174392397216232880} 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_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01-Rare.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01-Rare.prefab index 8475153f..dcdc94fb 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01-Rare.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v01-Rare.prefab @@ -26,15 +26,15 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 573666602360100646} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0000048067} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4327911362163307378} + m_Father: {fileID: 8417263142375954454} 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: -1.9, y: -36.6} + m_AnchoredPosition: {x: 0.7999512, y: -41.700005} m_SizeDelta: {x: 89.549, y: 56.809} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &224970991088968270 @@ -456,6 +456,8 @@ MonoBehaviour: cardIndex: 0 cardDescription: {fileID: 4157078162787977941} cardName: {fileID: 6020088242945090177} + cardType: {fileID: 0} + cardTypeImage: {fileID: 0} cardImage: {fileID: 2030393732758620615} midBorder: {fileID: 0} topBorder: {fileID: 3893753280325337861} @@ -465,6 +467,8 @@ MonoBehaviour: canUse: 1 smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db, type: 3} + noSmallCard: 0 + noSyncText: 0 --- !u!114 &5545682449418996990 MonoBehaviour: m_ObjectHideFlags: 0 @@ -535,7 +539,6 @@ GameObject: - component: {fileID: 4217468808005274720} - component: {fileID: 6521733443206888108} - component: {fileID: 6020088242945090177} - - component: {fileID: 2650526586693170461} m_Layer: 5 m_Name: CardName m_TagString: Card @@ -551,15 +554,15 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4434340823566726060} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.0000018025} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4327911362163307378} + m_Father: {fileID: 8417263142375954454} 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: -1.1527, y: -0.4} + m_AnchoredPosition: {x: 1.5473123, y: -5.5000367} m_SizeDelta: {x: 95.387, y: 19.2492} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6521733443206888108 @@ -604,29 +607,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u666E\u901A\u653B\u51FB" ---- !u!223 &2650526586693170461 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4434340823566726060} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 4 - m_TargetDisplay: 0 --- !u!1 &5174392397216232880 GameObject: m_ObjectHideFlags: 0 @@ -655,8 +635,8 @@ RectTransform: m_GameObject: {fileID: 5174392397216232880} 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_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -753,9 +733,7 @@ RectTransform: m_Children: - {fileID: 3176423819686732705} - {fileID: 452408839154702700} - - {fileID: 4217468808005274720} - {fileID: 8081187808729066129} - - {fileID: 542941900698277435} m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -830,7 +808,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0.0000021324} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4217468808005274720} + - {fileID: 542941900698277435} m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v02-Legendary.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v02-Legendary.prefab index 18222266..25c6d36e 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v02-Legendary.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v02-Legendary.prefab @@ -101,15 +101,15 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 573666602360100646} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0000048067} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4327911362163307378} + m_Father: {fileID: 8417263142375954454} 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: -1.9, y: -36.6} + m_AnchoredPosition: {x: -0.3000244, y: -46.10003} m_SizeDelta: {x: 89.549, y: 56.809} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &224970991088968270 @@ -562,6 +562,8 @@ MonoBehaviour: cardIndex: 0 cardDescription: {fileID: 4157078162787977941} cardName: {fileID: 6020088242945090177} + cardType: {fileID: 0} + cardTypeImage: {fileID: 0} cardImage: {fileID: 2030393732758620615} midBorder: {fileID: 3095710138702975603} topBorder: {fileID: 3893753280325337861} @@ -571,6 +573,8 @@ MonoBehaviour: canUse: 1 smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db, type: 3} + noSmallCard: 0 + noSyncText: 0 --- !u!114 &5545682449418996990 MonoBehaviour: m_ObjectHideFlags: 0 @@ -656,15 +660,15 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4434340823566726060} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.0000018025} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4327911362163307378} + m_Father: {fileID: 8417263142375954454} 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: -1.1527, y: -0.000005722} + m_AnchoredPosition: {x: 0.44727564, y: -9.500006} m_SizeDelta: {x: 95.387, y: 19.2492} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6521733443206888108 @@ -737,8 +741,8 @@ RectTransform: m_GameObject: {fileID: 5174392397216232880} 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_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -836,9 +840,7 @@ RectTransform: - {fileID: 3176423819686732705} - {fileID: 452408839154702700} - {fileID: 6256866880103788458} - - {fileID: 4217468808005274720} - {fileID: 8081187808729066129} - - {fileID: 542941900698277435} m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -915,6 +917,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6205310349598168271} + - {fileID: 542941900698277435} + - {fileID: 4217468808005274720} m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Common.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Common.prefab index cef71655..333897dc 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Common.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Common.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 542941900698277435} - component: {fileID: 224970991088968270} - component: {fileID: 7547543933361732122} - - component: {fileID: 5364885657934846216} m_Layer: 5 m_Name: CardType m_TagString: Card @@ -27,15 +26,15 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 573666602360100646} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0000048067} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4327911362163307378} + m_Father: {fileID: 8417263142375954454} 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: -1.1, y: -21.6} + m_AnchoredPosition: {x: 1.6000122, y: -26.699976} m_SizeDelta: {x: 40, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &224970991088968270 @@ -80,29 +79,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u653B\u51FB" ---- !u!223 &5364885657934846216 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 573666602360100646} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 4 - m_TargetDisplay: 0 --- !u!1 &1178194137939068069 GameObject: m_ObjectHideFlags: 0 @@ -138,8 +114,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -7, y: 2.1} - m_SizeDelta: {x: 17.977, y: 49.3483} + m_AnchoredPosition: {x: -4.156502, y: 4.813301} + m_SizeDelta: {x: 17.0622, y: 50.3034} m_Pivot: {x: 0, y: 0} --- !u!222 &7682921576911217389 CanvasRenderer: @@ -338,8 +314,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -1.5999985, y: 2} - m_SizeDelta: {x: 30, y: 32.64} + m_AnchoredPosition: {x: 0.9686012, y: 8.5818} + m_SizeDelta: {x: 28.4733, y: 33.2717} m_Pivot: {x: 0, y: 1} --- !u!222 &184297988404096596 CanvasRenderer: @@ -491,6 +467,8 @@ MonoBehaviour: canUse: 1 smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db, type: 3} + noSmallCard: 0 + noSyncText: 0 --- !u!114 &5545682449418996990 MonoBehaviour: m_ObjectHideFlags: 0 @@ -548,7 +526,7 @@ MonoBehaviour: speed: 4 moveOffset: 50 originPoint: {x: 0, y: 0, z: 0} - UpperOffset: {x: 0, y: 50, z: 0} + UpperOffset: {x: 0, y: 70, z: 0} originRotation: {x: 0, y: 0, z: 0} --- !u!1 &4434340823566726060 GameObject: @@ -561,7 +539,6 @@ GameObject: - component: {fileID: 4217468808005274720} - component: {fileID: 6521733443206888108} - component: {fileID: 6020088242945090177} - - component: {fileID: 2650526586693170461} m_Layer: 5 m_Name: CardName m_TagString: Card @@ -577,15 +554,15 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4434340823566726060} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.0000018025} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4327911362163307378} + m_Father: {fileID: 8417263142375954454} 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: -1.1527, y: -0.000005722} + m_AnchoredPosition: {x: 1.5473123, y: -5.0999813} m_SizeDelta: {x: 95.387, y: 19.2492} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6521733443206888108 @@ -630,29 +607,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u666E\u901A\u653B\u51FB" ---- !u!223 &2650526586693170461 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4434340823566726060} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 4 - m_TargetDisplay: 0 --- !u!1 &5174392397216232880 GameObject: m_ObjectHideFlags: 0 @@ -681,8 +635,8 @@ RectTransform: m_GameObject: {fileID: 5174392397216232880} 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_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -779,16 +733,14 @@ RectTransform: m_Children: - {fileID: 3176423819686732705} - {fileID: 452408839154702700} - - {fileID: 4217468808005274720} - {fileID: 8081187808729066129} - - {fileID: 542941900698277435} - {fileID: 3389266218039999991} m_Father: {fileID: 7139562062302679022} 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: 98.3944, y: 168.3662} + m_AnchoredPosition: {x: -0.6933, y: 4.6078} + m_SizeDelta: {x: 93.3871, y: 171.6245} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5223995665505545359 CanvasRenderer: @@ -857,13 +809,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0.0000021324} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4217468808005274720} + - {fileID: 542941900698277435} m_Father: {fileID: 7139562062302679022} 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: -2.7, y: 5.1} - m_SizeDelta: {x: 140, y: 210.2} + m_AnchoredPosition: {x: -3.256, y: 9.806503} + m_SizeDelta: {x: 132.8754, y: 214.2679} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6630524511444619868 CanvasRenderer: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Legendary.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Legendary.prefab index f67a3758..13ca9b51 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Legendary.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Legendary.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 542941900698277435} - component: {fileID: 224970991088968270} - component: {fileID: 7547543933361732122} - - component: {fileID: 5364885657934846216} m_Layer: 5 m_Name: CardType m_TagString: Card @@ -27,15 +26,15 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 573666602360100646} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0000048067} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4327911362163307378} + m_Father: {fileID: 8417263142375954454} 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: -1.6, y: -21.8} + m_AnchoredPosition: {x: 1.1000122, y: -26.899975} m_SizeDelta: {x: 40, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &224970991088968270 @@ -80,29 +79,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u653B\u51FB" ---- !u!223 &5364885657934846216 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 573666602360100646} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 4 - m_TargetDisplay: 0 --- !u!1 &1178194137939068069 GameObject: m_ObjectHideFlags: 0 @@ -138,8 +114,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -7, y: 2.1} - m_SizeDelta: {x: 17.977, y: 49.3483} + m_AnchoredPosition: {x: -3.6875, y: 4.8352} + m_SizeDelta: {x: 17.1306, y: 50.0834} m_Pivot: {x: 0, y: 0} --- !u!222 &7682921576911217389 CanvasRenderer: @@ -338,8 +314,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -1.5999985, y: 2} - m_SizeDelta: {x: 30, y: 32.64} + m_AnchoredPosition: {x: 1.4583015, y: 7.713} + m_SizeDelta: {x: 28.5875, y: 33.1262} m_Pivot: {x: 0, y: 1} --- !u!222 &184297988404096596 CanvasRenderer: @@ -491,6 +467,8 @@ MonoBehaviour: canUse: 1 smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db, type: 3} + noSmallCard: 0 + noSyncText: 0 --- !u!114 &5545682449418996990 MonoBehaviour: m_ObjectHideFlags: 0 @@ -548,7 +526,7 @@ MonoBehaviour: speed: 4 moveOffset: 50 originPoint: {x: 0, y: 0, z: 0} - UpperOffset: {x: 0, y: 50, z: 0} + UpperOffset: {x: 0, y: 70, z: 0} originRotation: {x: 0, y: 0, z: 0} --- !u!1 &4434340823566726060 GameObject: @@ -561,7 +539,6 @@ GameObject: - component: {fileID: 4217468808005274720} - component: {fileID: 6521733443206888108} - component: {fileID: 6020088242945090177} - - component: {fileID: 2650526586693170461} m_Layer: 5 m_Name: CardName m_TagString: Card @@ -577,15 +554,15 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4434340823566726060} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.0000018025} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4327911362163307378} + m_Father: {fileID: 8417263142375954454} 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: -1.1527, y: -0.000005722} + m_AnchoredPosition: {x: 1.5473123, y: -5.0999813} m_SizeDelta: {x: 95.387, y: 19.2492} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6521733443206888108 @@ -630,29 +607,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u666E\u901A\u653B\u51FB" ---- !u!223 &2650526586693170461 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4434340823566726060} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 4 - m_TargetDisplay: 0 --- !u!1 &5174392397216232880 GameObject: m_ObjectHideFlags: 0 @@ -681,8 +635,8 @@ RectTransform: m_GameObject: {fileID: 5174392397216232880} 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_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -779,16 +733,14 @@ RectTransform: m_Children: - {fileID: 3176423819686732705} - {fileID: 452408839154702700} - - {fileID: 4217468808005274720} - {fileID: 8081187808729066129} - - {fileID: 542941900698277435} - {fileID: 3389266218039999991} m_Father: {fileID: 7139562062302679022} 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: 98.3944, y: 168.3662} + m_AnchoredPosition: {x: 0.0403, y: 4.193501} + m_SizeDelta: {x: 93.7617, y: 170.8744} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5223995665505545359 CanvasRenderer: @@ -857,13 +809,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0.0000021324} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4217468808005274720} + - {fileID: 542941900698277435} m_Father: {fileID: 7139562062302679022} 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: -2.7, y: 5.1} - m_SizeDelta: {x: 140, y: 210.2} + m_AnchoredPosition: {x: -2.5326, y: 9.369503} + m_SizeDelta: {x: 133.4084, y: 213.3313} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6630524511444619868 CanvasRenderer: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Rare.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Rare.prefab index 022489c7..b592e8ef 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Rare.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Rare.prefab @@ -1,108 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &573666602360100646 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 542941900698277435} - - component: {fileID: 224970991088968270} - - component: {fileID: 7547543933361732122} - - component: {fileID: 5364885657934846216} - m_Layer: 5 - m_Name: CardType - m_TagString: Card - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &542941900698277435 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 573666602360100646} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0000048067} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4327911362163307378} - 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: -1.6, y: -21.8} - m_SizeDelta: {x: 40, y: 25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &224970991088968270 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 573666602360100646} - m_CullTransparentMesh: 1 ---- !u!114 &7547543933361732122 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 573666602360100646} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 10 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u653B\u51FB" ---- !u!223 &5364885657934846216 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 573666602360100646} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 4 - m_TargetDisplay: 0 --- !u!1 &1178194137939068069 GameObject: m_ObjectHideFlags: 0 @@ -138,8 +35,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -7, y: 2.1} - m_SizeDelta: {x: 17.977, y: 49.3483} + m_AnchoredPosition: {x: -3.7095032, y: 4.3643} + m_SizeDelta: {x: 17.141, y: 50.2342} m_Pivot: {x: 0, y: 0} --- !u!222 &7682921576911217389 CanvasRenderer: @@ -338,8 +235,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -1.5999985, y: 2} - m_SizeDelta: {x: 30, y: 32.64} + m_AnchoredPosition: {x: 1.4393005, y: 7.8528} + m_SizeDelta: {x: 28.6048, y: 33.2259} m_Pivot: {x: 0, y: 1} --- !u!222 &184297988404096596 CanvasRenderer: @@ -480,7 +377,7 @@ MonoBehaviour: cardIndex: 0 cardDescription: {fileID: 4157078162787977941} cardName: {fileID: 6020088242945090177} - cardType: {fileID: 7547543933361732122} + cardType: {fileID: 3415050461229099913} cardTypeImage: {fileID: 2180037887096685672} cardImage: {fileID: 2030393732758620615} midBorder: {fileID: 0} @@ -491,6 +388,8 @@ MonoBehaviour: canUse: 1 smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db, type: 3} + noSmallCard: 0 + noSyncText: 0 --- !u!114 &5545682449418996990 MonoBehaviour: m_ObjectHideFlags: 0 @@ -548,7 +447,7 @@ MonoBehaviour: speed: 4 moveOffset: 50 originPoint: {x: 0, y: 0, z: 0} - UpperOffset: {x: 0, y: 50, z: 0} + UpperOffset: {x: 0, y: 70, z: 0} originRotation: {x: 0, y: 0, z: 0} --- !u!1 &4434340823566726060 GameObject: @@ -561,7 +460,6 @@ GameObject: - component: {fileID: 4217468808005274720} - component: {fileID: 6521733443206888108} - component: {fileID: 6020088242945090177} - - component: {fileID: 2650526586693170461} m_Layer: 5 m_Name: CardName m_TagString: Card @@ -577,15 +475,15 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4434340823566726060} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.0000018025} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4327911362163307378} + m_Father: {fileID: 8417263142375954454} 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: -1.1527, y: -0.000005722} + m_AnchoredPosition: {x: 1.5473123, y: -5.0999813} m_SizeDelta: {x: 95.387, y: 19.2492} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6521733443206888108 @@ -630,29 +528,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u666E\u901A\u653B\u51FB" ---- !u!223 &2650526586693170461 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4434340823566726060} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 1 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 4 - m_TargetDisplay: 0 --- !u!1 &5174392397216232880 GameObject: m_ObjectHideFlags: 0 @@ -681,8 +556,8 @@ RectTransform: m_GameObject: {fileID: 5174392397216232880} 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_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 7139562062302679022} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -747,6 +622,85 @@ MonoBehaviour: type: 3} arrowNodeNum: 10 scaleFactor: 0.5 +--- !u!1 &5236091805905574404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4703445304243419289} + - component: {fileID: 717817782204063160} + - component: {fileID: 3415050461229099913} + m_Layer: 5 + m_Name: CardType + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4703445304243419289 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5236091805905574404} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8417263142375954454} + 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: 1.1000122, y: -19.8} + m_SizeDelta: {x: 40, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &717817782204063160 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5236091805905574404} + m_CullTransparentMesh: 1 +--- !u!114 &3415050461229099913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5236091805905574404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 10 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u653B\u51FB" --- !u!1 &5247884972612715378 GameObject: m_ObjectHideFlags: 0 @@ -779,16 +733,14 @@ RectTransform: m_Children: - {fileID: 3176423819686732705} - {fileID: 452408839154702700} - - {fileID: 4217468808005274720} - {fileID: 8081187808729066129} - - {fileID: 542941900698277435} - {fileID: 3389266218039999991} m_Father: {fileID: 7139562062302679022} 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: 98.3944, y: 168.3662} + m_AnchoredPosition: {x: 0.0583, y: 4.0217} + m_SizeDelta: {x: 93.8186, y: 171.3886} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5223995665505545359 CanvasRenderer: @@ -857,13 +809,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0.0000021324} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4217468808005274720} + - {fileID: 4703445304243419289} m_Father: {fileID: 7139562062302679022} 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: -2.7, y: 5.1} - m_SizeDelta: {x: 140, y: 210.2} + m_AnchoredPosition: {x: -2.516, y: 9.2133} + m_SizeDelta: {x: 133.4893, y: 213.9734} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6630524511444619868 CanvasRenderer: diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/AshBeetle.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/AshBeetle.prefab index 10450492..14fa895f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/AshBeetle.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/AshBeetle.prefab @@ -85,7 +85,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 8888823514061126702} bone: {fileID: 0} bone_Re: {fileID: 0} canMove: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BlastFistMushroom.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BlastFistMushroom.prefab index 5c5e03bf..a51c84ce 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BlastFistMushroom.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BlastFistMushroom.prefab @@ -253,7 +253,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 2538126080127532486} bone: {fileID: 0} bone_Re: {fileID: 0} canMove: 0 @@ -275,6 +275,7 @@ MonoBehaviour: m_Bits: 0 time: 0.2 moveSpeed: 4 + attackWaitCount: 0 --- !u!1 &6516476525884930445 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullGuardian.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullGuardian.prefab index 7633f146..44bebb01 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullGuardian.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullGuardian.prefab @@ -407,7 +407,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 3703101468976842238} bone: {fileID: 0} bone_Re: {fileID: 1880325291853289959, guid: a2d780b42e1e8544784a6c3fbad33b85, type: 3} canMove: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullWarlock.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullWarlock.prefab index a069a2a9..5fa03910 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullWarlock.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullWarlock.prefab @@ -442,7 +442,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 1280161799412266582} bone: {fileID: 0} bone_Re: {fileID: 2174795850562622621, guid: 3b3460a2f85e4af418b1fd504711dac7, type: 3} canMove: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullmage.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullmage.prefab index fbaa2a36..ca7231c7 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullmage.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoneForSkullmage.prefab @@ -357,7 +357,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 1445892092379521461} bone: {fileID: 0} bone_Re: {fileID: 8591057712024743076, guid: 75eed9d1e1f05bb42b86c70a9cb083c1, type: 3} canMove: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/CorrosiveSludge.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/CorrosiveSludge.prefab index b05ceed2..b4d9d7c1 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/CorrosiveSludge.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/CorrosiveSludge.prefab @@ -323,7 +323,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 1524445813832419066} bone: {fileID: 0} bone_Re: {fileID: 0} canMove: 1 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/EmberWraith.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/EmberWraith.prefab index cac3a7e1..ce1c6cbd 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/EmberWraith.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/EmberWraith.prefab @@ -85,7 +85,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 3085411190745214963} bone: {fileID: 0} bone_Re: {fileID: 0} canMove: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/HoodWanderer.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/HoodWanderer.prefab index 14fc157b..e22eaa3f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/HoodWanderer.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/HoodWanderer.prefab @@ -117,6 +117,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 190836291596224913} + - {fileID: 5743608313717491450} - {fileID: 5127822167492661112} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 30.08, y: 180, z: 0} @@ -428,3 +429,38 @@ MonoBehaviour: speed: 0.005 currentdisappearTime: 0 aimGamgObject: {fileID: 0} +--- !u!1 &8988369588193342368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5743608313717491450} + m_Layer: 0 + m_Name: FollowPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5743608313717491450 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8988369588193342368} + m_LocalRotation: {x: 0.00004351113, y: -0.7101218, z: 0.7040763, w: 0.0019181424} + m_LocalPosition: {x: 0, y: 0, z: 6.300003} + m_LocalScale: {x: 9.999354, y: 8.328876, z: 1.0000705} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6948721626214287659} + 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.53699994} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ParasiticMushroom.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ParasiticMushroom.prefab index 93950367..a3ef73e1 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ParasiticMushroom.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ParasiticMushroom.prefab @@ -169,7 +169,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 8828816690776817641} bone: {fileID: 0} bone_Re: {fileID: 0} canMove: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_SkullGuardian.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_SkullGuardian.prefab index 24ad1d89..f4c33cb2 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_SkullGuardian.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_SkullGuardian.prefab @@ -239,7 +239,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 6460243059731195119} bone: {fileID: 0} bone_Re: {fileID: 0} canMove: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_SkullWarlock.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_SkullWarlock.prefab index 29304783..d66109f5 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_SkullWarlock.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_SkullWarlock.prefab @@ -85,7 +85,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 7352301446708720754} bone: {fileID: 0} bone_Re: {fileID: 0} canMove: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_Skullmage.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_Skullmage.prefab index 39e2f125..477e76e0 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_Skullmage.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RE_Skullmage.prefab @@ -357,7 +357,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 934719219940730582} bone: {fileID: 0} bone_Re: {fileID: 0} canMove: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ShatteringFistMushroom.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ShatteringFistMushroom.prefab index b6afa15e..64f3a9ec 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ShatteringFistMushroom.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ShatteringFistMushroom.prefab @@ -85,7 +85,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 3897666427110130229} bone: {fileID: 0} bone_Re: {fileID: 0} canMove: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab index ceb9cf51..38349556 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab @@ -239,7 +239,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 8098012657445599304} bone: {fileID: 6928223977781211758, guid: 5a133951e41a4ec43a57bc107e44f87e, type: 3} bone_Re: {fileID: 0} canMove: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullWarlock.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullWarlock.prefab index 532fdaf3..cd4c3096 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullWarlock.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullWarlock.prefab @@ -85,7 +85,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 7232846402010213242} bone: {fileID: 6928223977781211758, guid: 8a24262c2ec3f9a45919642911da8010, type: 3} bone_Re: {fileID: 0} canMove: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Skullmage.prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Skullmage.prefab index ba0d7327..faf579e3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Skullmage.prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Skullmage.prefab @@ -357,7 +357,7 @@ MonoBehaviour: canLineAppre: 1 disableAttack: {fileID: 0} enemyUIBar: {fileID: 0} - followPoint: {fileID: 0} + followPoint: {fileID: 5963478664622369301} bone: {fileID: 6928223977781211758, guid: 71195df257cd2c84f8e1df758c1dcf58, type: 3} bone_Re: {fileID: 0} canMove: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs index cfdecf20..88b88431 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs @@ -180,8 +180,7 @@ public class Servant : MonoBehaviour //每个角度分五个节点 for(int a=1;a<=pathNodeNum ;a ++) { - float currentAngle = startAngle + angle * (i - 1) + a * angle / (float)pathNodeNum; - Debug.Log(currentAngle); + float currentAngle = startAngle + angle * (i - 1) + a * angle / (float)pathNodeNum; // currentUI.transform.localPosition = new Vector3(radius * Mathf.Sin(currentAngle * Mathf.Deg2Rad), radius * (1 - Mathf.Cos(currentAngle * Mathf.Deg2Rad)), 0); //currentUI.transform.localEulerAngles -= SkillUI.transform.localEulerAngles;//矫正角度 skillUIPos.Add(new Vector3(radius * Mathf.Sin(currentAngle * Mathf.Deg2Rad), radius * (1 + Mathf.Cos(currentAngle * Mathf.Deg2Rad)), 0));