diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_结算榜.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_结算榜.spriteatlas index 91c52cf7..c509ddcf 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_结算榜.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_结算榜.spriteatlas @@ -82,58 +82,17 @@ SpriteAtlas: - {fileID: 21300000, guid: 8b7c17dca096f454c9945d1b52b5216f, type: 3} - {fileID: 21300000, guid: 362df9338a474e84d804138c397a8acd, type: 3} - {fileID: 21300000, guid: 78b18a7a9f3c7da4f8cd13689bb3dc8f, type: 3} + - {fileID: 21300000, guid: e568a9858ae0b6947bd79fafaa62130c, type: 3} - {fileID: 21300000, guid: f8de1550cddd55e49841d596c9edcd74, type: 3} - {fileID: 21300000, guid: 4fc99ab111d45a34591903d52ff0d446, type: 3} - {fileID: 21300000, guid: 2a24d7cc45511384cbd2705fdafa7fb5, type: 3} bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: - - f8de1550cddd55e49841d596c9edcd74: 21300000 - - 4fc99ab111d45a34591903d52ff0d446: 21300000 - - d99163d14298deb499a73e1b59928b67: 21300000 - - 362df9338a474e84d804138c397a8acd: 21300000 - - 628d5f63dcbf70246b75747c8a8b0418: 21300000 - - a0ef531775b048a48952ffcaa0e0a3a5: 21300000 - - dafc8c27c532c06459df80f623c02708: 21300000 - - b30494c8e3c9089438a965ff0d986aeb: 21300000 - - 83bc42693ded8694383a5b24e411bb3d: 21300000 - - 8951c7f99e07487499ed38049129f913: 21300000 - - 78b18a7a9f3c7da4f8cd13689bb3dc8f: 21300000 - - 03e1050c5f603e34080697c84e91748a: 21300000 - - 2a24d7cc45511384cbd2705fdafa7fb5: 21300000 - - 8b7c17dca096f454c9945d1b52b5216f: 21300000 + packedSpriteRenderDataKeys: [] m_MasterAtlas: {fileID: 0} - m_PackedSprites: - - {fileID: 21300000, guid: f8de1550cddd55e49841d596c9edcd74, type: 3} - - {fileID: 21300000, guid: 4fc99ab111d45a34591903d52ff0d446, type: 3} - - {fileID: 21300000, guid: d99163d14298deb499a73e1b59928b67, type: 3} - - {fileID: 21300000, guid: 362df9338a474e84d804138c397a8acd, type: 3} - - {fileID: 21300000, guid: 628d5f63dcbf70246b75747c8a8b0418, type: 3} - - {fileID: 21300000, guid: a0ef531775b048a48952ffcaa0e0a3a5, type: 3} - - {fileID: 21300000, guid: dafc8c27c532c06459df80f623c02708, type: 3} - - {fileID: 21300000, guid: b30494c8e3c9089438a965ff0d986aeb, type: 3} - - {fileID: 21300000, guid: 83bc42693ded8694383a5b24e411bb3d, type: 3} - - {fileID: 21300000, guid: 8951c7f99e07487499ed38049129f913, type: 3} - - {fileID: 21300000, guid: 78b18a7a9f3c7da4f8cd13689bb3dc8f, type: 3} - - {fileID: 21300000, guid: 03e1050c5f603e34080697c84e91748a, type: 3} - - {fileID: 21300000, guid: 2a24d7cc45511384cbd2705fdafa7fb5, type: 3} - - {fileID: 21300000, guid: 8b7c17dca096f454c9945d1b52b5216f, type: 3} - m_PackedSpriteNamesToIndex: - - phb - - zlyj - - 4_d - - fh - - 2_d2 - - JS_d_box - - 3_d - - 2_d - - 1_d1 - - 1_d - - js_bt - - 3_d3 - - "\u6700\u5F3A\u5927\u8111\u4E16\u754C\u6392\u884C1" - - SJPM_icon + m_PackedSprites: [] + m_PackedSpriteNamesToIndex: [] m_RenderDataMap: {} m_Tag: "UIRaw_Atlas_\u7ED3\u7B97\u699C" m_IsVariant: 0 diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index 65b629d2..cf55af15 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -37349,6 +37349,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1576965197191371971} - {fileID: 4982030497614920511} - {fileID: 3736817874055198994} - {fileID: 6033434420635246474} @@ -52663,11 +52664,6 @@ RectTransform: - {fileID: 1203314418780651017} - {fileID: 6572338166829820615} - {fileID: 5301024327851551324} - - {fileID: 8227827254484723636} - - {fileID: 5773295286254467215} - - {fileID: 6763852824298412474} - - {fileID: 5020542224144510446} - - {fileID: 56514501215894123} m_Father: {fileID: 245133209852100473} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -72810,6 +72806,46 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6663783441399910428 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1576965197191371971} + m_Layer: 5 + m_Name: m_rectTopFx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1576965197191371971 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6663783441399910428} + 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: + - {fileID: 8227827254484723636} + - {fileID: 5773295286254467215} + - {fileID: 6763852824298412474} + - {fileID: 5020542224144510446} + - {fileID: 56514501215894123} + m_Father: {fileID: 1508900408836313865} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6765209622505461136 GameObject: m_ObjectHideFlags: 0 @@ -98589,7 +98625,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 6490355279263826686} + m_TransformParent: {fileID: 1576965197191371971} m_Modifications: - target: {fileID: 18287259178651034, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} propertyPath: m_SortingLayer @@ -98685,23 +98721,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8667435944646448852, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8667435944646448852, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8667435944646448852, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8667435944646448852, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -0.002380371 objectReference: {fileID: 0} - target: {fileID: 8667435944646448852, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 829.9 objectReference: {fileID: 0} - target: {fileID: 8667435944646448852, guid: c033aa87f30726b448df432f8d2cf79c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -98836,7 +98872,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 6490355279263826686} + m_TransformParent: {fileID: 1576965197191371971} m_Modifications: - target: {fileID: 1980617973639438117, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} propertyPath: m_SortingLayer @@ -98896,23 +98932,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2513308301931425141, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2513308301931425141, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2513308301931425141, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2513308301931425141, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -0.002380371 objectReference: {fileID: 0} - target: {fileID: 2513308301931425141, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 829.9 objectReference: {fileID: 0} - target: {fileID: 2513308301931425141, guid: afc7b620c788a6c43b502c866ebe3be4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -98986,7 +99022,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 6490355279263826686} + m_TransformParent: {fileID: 1576965197191371971} m_Modifications: - target: {fileID: 610861506519021388, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_Name @@ -99054,23 +99090,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3347277088054391551, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3347277088054391551, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3347277088054391551, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3347277088054391551, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -0.002380371 objectReference: {fileID: 0} - target: {fileID: 3347277088054391551, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 829.9 objectReference: {fileID: 0} - target: {fileID: 3347277088054391551, guid: ac037a7f8e30c3d49a3d3d469d6f23b4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -99142,6 +99178,14 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2671284872217046443, guid: 6ae035d3202a1674387b4a84f7768298, type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5277265603425306928, guid: 6ae035d3202a1674387b4a84f7768298, type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5848586857130893629, guid: 6ae035d3202a1674387b4a84f7768298, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -99222,6 +99266,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5927799128907228021, guid: 6ae035d3202a1674387b4a84f7768298, type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8226064032418294046, guid: 6ae035d3202a1674387b4a84f7768298, type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -99238,7 +99290,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 6490355279263826686} + m_TransformParent: {fileID: 1576965197191371971} m_Modifications: - target: {fileID: 44366981561053841, guid: 6411fa915bcf8b2498ed7f7755101e81, type: 3} propertyPath: m_SortingLayer @@ -99322,23 +99374,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4602961601050214702, guid: 6411fa915bcf8b2498ed7f7755101e81, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4602961601050214702, guid: 6411fa915bcf8b2498ed7f7755101e81, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4602961601050214702, guid: 6411fa915bcf8b2498ed7f7755101e81, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4602961601050214702, guid: 6411fa915bcf8b2498ed7f7755101e81, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -0.002380371 objectReference: {fileID: 0} - target: {fileID: 4602961601050214702, guid: 6411fa915bcf8b2498ed7f7755101e81, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 829.9 objectReference: {fileID: 0} - target: {fileID: 4602961601050214702, guid: 6411fa915bcf8b2498ed7f7755101e81, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -99490,7 +99542,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 6490355279263826686} + m_TransformParent: {fileID: 1576965197191371971} m_Modifications: - target: {fileID: 497157564599735893, guid: 0a9da95ce3e65974f9fb4aadbac3aac3, type: 3} propertyPath: m_SortingLayer @@ -99586,23 +99638,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9112713449763400918, guid: 0a9da95ce3e65974f9fb4aadbac3aac3, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9112713449763400918, guid: 0a9da95ce3e65974f9fb4aadbac3aac3, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9112713449763400918, guid: 0a9da95ce3e65974f9fb4aadbac3aac3, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 9112713449763400918, guid: 0a9da95ce3e65974f9fb4aadbac3aac3, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: -0.002380371 objectReference: {fileID: 0} - target: {fileID: 9112713449763400918, guid: 0a9da95ce3e65974f9fb4aadbac3aac3, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: 829.9 objectReference: {fileID: 0} - target: {fileID: 9112713449763400918, guid: 0a9da95ce3e65974f9fb4aadbac3aac3, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab index c6128178..72a2ff87 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab @@ -602,7 +602,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.0058626058, y: 0.0021142536} + m_AnchoredPosition: {x: -0.000002749069, y: 0.0011273756} m_SizeDelta: {x: 0, y: 1292.4} m_Pivot: {x: 0, y: 1} --- !u!114 &6944785608262845692 @@ -1041,6 +1041,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 8343859269867458795} - {fileID: 182721815195331612} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2412,6 +2413,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7389691759355489600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8343859269867458795} + - component: {fileID: 5899873392473542918} + - component: {fileID: 6590558151194908085} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8343859269867458795 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7389691759355489600} + 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: 2338385386102721414} + 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.75, y: -0.28577} + m_SizeDelta: {x: 1080, y: 2340.5715} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5899873392473542918 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7389691759355489600} + m_CullTransparentMesh: 1 +--- !u!114 &6590558151194908085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7389691759355489600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: e568a9858ae0b6947bd79fafaa62130c, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7599271821965811424 GameObject: m_ObjectHideFlags: 0 diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/jsbeij.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/jsbeij.png new file mode 100644 index 00000000..833ab187 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/jsbeij.png differ diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/jsbeij.png.meta b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/jsbeij.png.meta new file mode 100644 index 00000000..e86fdf19 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/jsbeij.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: e568a9858ae0b6947bd79fafaa62130c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Raw/LW_Texture.renderTexture b/UnityProject/Assets/AssetRaw/UIRaw/Raw/LW_Texture.renderTexture index fe42f432..e9b67174 100644 --- a/UnityProject/Assets/AssetRaw/UIRaw/Raw/LW_Texture.renderTexture +++ b/UnityProject/Assets/AssetRaw/UIRaw/Raw/LW_Texture.renderTexture @@ -15,7 +15,7 @@ RenderTexture: m_IsAlphaChannelOptional: 0 serializedVersion: 5 m_Width: 1080 - m_Height: 1920 + m_Height: 2340 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 94 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 05407b53..0497c78a 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -254,7 +254,7 @@ namespace GameLogic m_tmpAllValue.text = ((int)m_AllPush).ToString(); } - + List m_ListEgo = new List(); /// diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index a0107b73..1472ee32 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -16,6 +16,7 @@ namespace GameLogic class UIGameBattle : UIWindow { #region 脚本工具生成的代码 + private RectTransform m_rectTopFx; private RectTransform m_rectSdx; private RectTransform m_rectSceneFx; private RectTransform m_rectSpeed; @@ -38,7 +39,7 @@ namespace GameLogic private RawImage m_rimg_ViewTexture; private VideoPlayer m_video_Video; private RectTransform m_rect_Dz; - private TextMeshProUGUI m_tmp_dzPlayer; + private TextMeshProUGUI m_tmp_PlayerName; private RectTransform m_rectGjsk; private Image m_img_HuangJinShiDai; private Text m_textHuangJinInfo; @@ -50,6 +51,7 @@ namespace GameLogic private Image m_imgShiJianSign; protected override void ScriptGenerator() { + m_rectTopFx = FindChildComponent("Bg/m_rectTopFx"); m_rectSdx = FindChildComponent("Bg/m_rectSdx"); m_rectSceneFx = FindChildComponent("Bg/m_rectSceneFx"); m_rectSpeed = FindChildComponent("Bg/m_rectSpeed"); @@ -72,7 +74,7 @@ namespace GameLogic m_rimg_ViewTexture = FindChildComponent("Bg/BattleBg/m_rimg_ViewTexture"); m_video_Video = FindChildComponent("Bg/BattleBg/m_video_Video"); m_rect_Dz = FindChildComponent("Bg/m_rect_Dz"); - m_tmp_dzPlayer = FindChildComponent("Bg/m_rect_Dz/Icon/m_tmp_dzPlayer"); + m_tmp_PlayerName = FindChildComponent("Bg/m_rect_Dz/Icon/m_tmp_PlayerName"); m_rectGjsk = FindChildComponent("Bg/m_rectGjsk"); m_img_HuangJinShiDai = FindChildComponent("Bg/m_img_HuangJinShiDai"); m_textHuangJinInfo = FindChildComponent("Bg/m_img_HuangJinShiDai/m_textHuangJinInfo");