diff --git a/Assets/ManagedResources/Prefabs/UI/RoleGift/PlayerGiftPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleGift/PlayerGiftPanel.prefab index 0683dac511..4c727037ef 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleGift/PlayerGiftPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleGift/PlayerGiftPanel.prefab @@ -10846,15 +10846,15 @@ RectTransform: m_GameObject: {fileID: 2574615405018608539} 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_LocalScale: {x: 0.7, y: 0.7, z: 1} m_Children: [] m_Father: {fileID: 9007592198577183178} m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -60, y: -50} - m_SizeDelta: {x: 68, y: 68} + m_AnchoredPosition: {x: -367, y: -91} + m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6682919895382187291 CanvasRenderer: @@ -10884,7 +10884,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3} + m_Sprite: {fileID: 21300000, guid: d7183aaa8ad92e2488276d26fc370192, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11354,6 +11354,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &3407213292448976927 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7382897965622093301} + - component: {fileID: 3758772324048490737} + - component: {fileID: 4780529574127692707} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7382897965622093301 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3407213292448976927} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6542015628993622182} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3758772324048490737 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3407213292448976927} + m_CullTransparentMesh: 0 +--- !u!114 &4780529574127692707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3407213292448976927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: fbba7bf478bcbfa4e89527b0910764ef, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3456791326674520687 GameObject: m_ObjectHideFlags: 0 @@ -11382,14 +11456,15 @@ RectTransform: 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_Children: + - {fileID: 3942269627451719199} m_Father: {fileID: 1479412660855769799} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 173.5} - m_SizeDelta: {x: 0, y: 347} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2725908130296790183 CanvasRenderer: @@ -11419,8 +11494,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: d0af3f2a2e71ac6438b1f993847a96c2, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -22208,6 +22283,80 @@ RectTransform: m_AnchoredPosition: {x: -74.000046, y: -72.5} m_SizeDelta: {x: 148, y: 36.54} m_Pivot: {x: 0, y: 0} +--- !u!1 &5700849336948168935 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3942269627451719199} + - component: {fileID: 8451434770929925963} + - component: {fileID: 1949602452385584801} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3942269627451719199 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5700849336948168935} + m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1191475475263750149} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 180, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8451434770929925963 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5700849336948168935} + m_CullTransparentMesh: 0 +--- !u!114 &1949602452385584801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5700849336948168935} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: fbba7bf478bcbfa4e89527b0910764ef, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &5734353530790825206 GameObject: m_ObjectHideFlags: 0 @@ -22280,14 +22429,15 @@ RectTransform: 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_Children: + - {fileID: 7382897965622093301} m_Father: {fileID: 1479412660855769799} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -49} - m_SizeDelta: {x: 0, y: 97.80005} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4090866821618464132 CanvasRenderer: @@ -22317,7 +22467,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 420d1d17a3d5ced4cb07001dd98f9852, type: 3} + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -32557,10 +32707,10 @@ RectTransform: m_Father: {fileID: 7342990840267444812} 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: 39.5, y: 159} - m_SizeDelta: {x: 79, y: 175} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 97.3, y: 209} + m_SizeDelta: {x: 99, y: 179} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8628126690075581181 CanvasRenderer: @@ -32590,7 +32740,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8561d25febfc8bc428011c49f29d126b, type: 3} + m_Sprite: {fileID: 21300000, guid: 0efe29bd0476d5d4e8c274f2030570ec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -33084,7 +33234,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -425} + m_AnchoredPosition: {x: 0, y: -456} m_SizeDelta: {x: 1080, y: -1101} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4814865812385901922 @@ -37914,8 +38064,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 386} - m_SizeDelta: {x: 2000, y: -920} + m_AnchoredPosition: {x: 367, y: 639} + m_SizeDelta: {x: 2000, y: -430} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4316329388318893454 CanvasRenderer: @@ -37945,7 +38095,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a4fdc599d7b64114e93c803b5bfc16f8, type: 3} + m_Sprite: {fileID: 21300000, guid: 46f9827b30ab31a4d92d7281451914d0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab index 33b3c87254..8aa5848be2 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab @@ -28,14 +28,15 @@ RectTransform: 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_Children: + - {fileID: 21414102437267752} m_Father: {fileID: 2155765969751685322} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 178.59998} - m_SizeDelta: {x: 0, y: 357.1} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2116659517 CanvasRenderer: @@ -65,8 +66,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: d0af3f2a2e71ac6438b1f993847a96c2, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -549,13 +550,14 @@ RectTransform: 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_Children: + - {fileID: 5854163897430184175} m_Father: {fileID: 2155765969751685322} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.025146484, y: -47} + m_AnchoredPosition: {x: -0.025146484, y: -50} m_SizeDelta: {x: -0.099975586, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6569879826823042364 @@ -586,7 +588,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 420d1d17a3d5ced4cb07001dd98f9852, type: 3} + m_Sprite: {fileID: 21300000, guid: af926bea5e282854f98cce4d8f6c5121, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -669,6 +671,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &711984140286657613 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 21414102437267752} + - component: {fileID: 4816670076161656336} + - component: {fileID: 8778189829285777279} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &21414102437267752 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 711984140286657613} + m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2116659515} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 180, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4816670076161656336 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 711984140286657613} + m_CullTransparentMesh: 0 +--- !u!114 &8778189829285777279 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 711984140286657613} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: fbba7bf478bcbfa4e89527b0910764ef, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &794548820055399985 GameObject: m_ObjectHideFlags: 0 @@ -919,6 +995,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &921586505169243035 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5854163897430184175} + - component: {fileID: 1601515625772174454} + - component: {fileID: 6387650450772436142} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5854163897430184175 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 921586505169243035} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4009267865868241954} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1601515625772174454 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 921586505169243035} + m_CullTransparentMesh: 0 +--- !u!114 &6387650450772436142 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 921586505169243035} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: fbba7bf478bcbfa4e89527b0910764ef, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &983038150618398400 GameObject: m_ObjectHideFlags: 0 @@ -6073,15 +6223,15 @@ RectTransform: m_GameObject: {fileID: 1336104246635325114} 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_LocalScale: {x: 0.7, y: 0.7, z: 1} m_Children: [] m_Father: {fileID: 4072935318317542415} m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -63, y: -52} - m_SizeDelta: {x: 68, y: 68} + m_AnchoredPosition: {x: -346, y: -91} + m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4705537261379448976 CanvasRenderer: @@ -6111,7 +6261,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3} + m_Sprite: {fileID: 21300000, guid: d7183aaa8ad92e2488276d26fc370192, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6273,7 +6423,7 @@ RectTransform: m_GameObject: {fileID: 1558974222827538013} 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_LocalScale: {x: 1.5, y: 1.5, z: 1} m_Children: - {fileID: 3912835091265650747} - {fileID: 6001477027529160757} @@ -6282,8 +6432,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -586} - m_SizeDelta: {x: 2000, y: 1000} + m_AnchoredPosition: {x: -792, y: -827} + m_SizeDelta: {x: 2000, y: 1490} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6168287311235063520 CanvasRenderer: @@ -6313,7 +6463,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: a4fdc599d7b64114e93c803b5bfc16f8, type: 3} + m_Sprite: {fileID: 21300000, guid: 46f9827b30ab31a4d92d7281451914d0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -33210,10 +33360,10 @@ RectTransform: m_Father: {fileID: 3568116551843442688} 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: 30, y: 79} - m_SizeDelta: {x: 79, y: 175} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 98.3, y: 129} + m_SizeDelta: {x: 99, y: 179} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8558266005218237519 CanvasRenderer: @@ -33243,7 +33393,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8561d25febfc8bc428011c49f29d126b, type: 3} + m_Sprite: {fileID: 21300000, guid: 0efe29bd0476d5d4e8c274f2030570ec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpStarListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpStarListPanel.prefab index 7d1879e987..0ba6c29219 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpStarListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpStarListPanel.prefab @@ -604,7 +604,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: + m_Text: "\u7A7A\u7A7A\u5982\u4E5F" LanguageIndex: 10146 --- !u!1 &5100338387593363128 GameObject: @@ -1214,8 +1214,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -40} - m_SizeDelta: {x: 384.31, y: 64.410034} + m_AnchoredPosition: {x: 0, y: -36.102} + m_SizeDelta: {x: 384.3, y: 72.205} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5033576533227295612 CanvasRenderer: @@ -1766,8 +1766,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: 362, y: 737} - m_SizeDelta: {x: 750, y: 71} + m_AnchoredPosition: {x: 372.2697, y: 739.5} + m_SizeDelta: {x: 812.01, y: 76} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5033404631703039772 CanvasRenderer: @@ -1798,7 +1798,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 895edaf5020aff14bb6181683b0ba980, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index b2f93efd38..9adf1343f3 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1525,7 +1525,7 @@ ActivityTypeDef = { ContinueGift = 85, -- 连续礼包 ContinuePackage = 87, -- 连购礼包 - Incarnation = 86,--抽卡变身卡 + Incarnation = 86,--抽卡奥义卡 jingjishilian = 88, chaozhifanli = 90, @@ -2699,7 +2699,7 @@ ItemBaseType = { JuLing = 8, --聚灵 Gem = 9, --命石 GodPrint = 10, --神印 - TurnsCard=11,--变身卡 + TurnsCard=11,--奥义卡 Talisman = 12, --法宝 FaXiang = 13, --法相 PlayerGift=14, --神将礼物 @@ -2919,7 +2919,7 @@ PRE_REWARD_POOL_TYPE = { LINGLONG = 17, --玲珑宝镜 TIANDIHONGLU = 18,--天地洪炉 TIANDIHONGLU_UP = 19,--天地洪炉 - Incarnation = 20,--变身卡 + Incarnation = 20,--奥义卡 } DirectBuyType = { XSHL = 11,--限时豪礼 diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua index d82ea47506..58389765e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua @@ -162,7 +162,7 @@ function this.SetSkillData(id) local changeCardData=this.itemDataList[id] changeCardData.skillDatas = ChangingCard[id].Skill[changeCardData.star+1] end ---设置变身卡所有属性加成 +--设置奥义卡所有属性加成 function this.SetPropDatas(id) this.itemDataList[id].proDatas =this.GetChangeCardProperty(id) end @@ -256,7 +256,7 @@ function this.GetIncarnationTotalPro() return proList end ---获取已上阵的变身卡 --界面获取 +--获取已上阵的奥义卡 --界面获取 function this.GetIncarnationData1() local datas = {} for k,v in pairs(this.itemDataList) do @@ -267,7 +267,7 @@ function this.GetIncarnationData1() return datas end ---获取已上阵的变身卡 --战斗获取 +--获取已上阵的奥义卡 --战斗获取 function this.GetIncarnationData() local datas = {} for k,v in pairs(this.itemDataList) do @@ -278,7 +278,7 @@ function this.GetIncarnationData() return datas end ---获取已上阵的变身卡 --战斗获取 +--获取已上阵的奥义卡 --战斗获取 function this.GetIncarnationDataById(id) for k,v in pairs(this.itemDataList) do if v.itemId == id then diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index 32397c05e3..da4dfd3ec7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -116,7 +116,7 @@ function GMPanel:InitComponent() {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "生成很多物品", inputTip = {""}, callBack = this.GetAllItems}, {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "鑫鹏的gm", inputTip = {""}, callBack = this.SendToXinPeng}, {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "一键法宝碎片", inputTip = {""}, callBack = this.GetFaBaoSuiPian}, - {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "一键变身卡", inputTip = {""}, callBack = this.GetBianshenka}, + {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "一键奥义卡", inputTip = {""}, callBack = this.GetBianshenka}, {type = GMType.Player, subType = GMSubType.Func, inputNum = 0, args = "", btnTip = "一键命石", inputTip = {""}, callBack = this.GetGem}, {type = GMType.Function, subType = GMSubType.Server, inputNum = 1, args = "16#%s#0", btnTip = "跳转", inputTip = {"输入兽潮层数"}, callBack = nil}, @@ -260,7 +260,7 @@ function this.GetManyItems(text) end) return end - if text == "一键变身卡" then + if text == "一键奥义卡" then local config = (ConfigManager.TryGetAllConfigsDataByKey(ConfigName.ItemConfig,"ItemType",ItemType.Incarnation)) local cor = coroutine.start(function() for k,v in ipairs(config) do @@ -401,7 +401,7 @@ function this.GetFaBaoSuiPian() end) end --- 一键变身卡 +-- 一键奥义卡 function this.GetBianshenka() local ic = ConfigManager.GetConfig(ConfigName.ItemConfig) local i = 0 diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index 41aa0c85cd..8671e1e166 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -627,7 +627,7 @@ function this:ShopItemAdapter(shopItem, itemData) -- if con.ItemType == ItemType.Incarnation then -- local num = BagManager.GetItemCountById(con.Id) -- if num > 0 or IncarnationManager.GetStatusByItemId(con.Id) >= 0 then - -- PopupTipPanel.ShowTip("无法选择已获取过的变身卡!") + -- PopupTipPanel.ShowTip("无法选择已获取过的奥义卡!") -- return -- end -- end diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index 140086924d..910abc5482 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -609,7 +609,7 @@ function ShopViewNew:ShopItemAdapter(shopItem, itemData) -- if con.ItemType == ItemType.Incarnation then -- local num = BagManager.GetItemCountById(con.Id) -- if num > 0 or IncarnationManager.GetStatusByItemId(con.Id) >= 0 then - -- PopupTipPanel.ShowTip("无法选择已获取过的变身卡!") + -- PopupTipPanel.ShowTip("无法选择已获取过的奥义卡!") -- return -- end -- end