From a3a4a858a80724140e36648e9d75f16366cf5ae0 Mon Sep 17 00:00:00 2001 From: hwj35 <691170510@qq.com> Date: 星期二, 07 一月 2025 11:05:00 +0800 Subject: [PATCH] Merge branch 'lang_en' of http://192.168.1.20:10010/r/snxxz_resourcesout into lang_en --- UI/Window/CommonGetItemWin.prefab | 444 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 413 insertions(+), 31 deletions(-) diff --git a/UI/Window/CommonGetItemWin.prefab b/UI/Window/CommonGetItemWin.prefab index f1f1b8b..aa1eed3 100644 --- a/UI/Window/CommonGetItemWin.prefab +++ b/UI/Window/CommonGetItemWin.prefab @@ -140,7 +140,6 @@ sureBtn: {fileID: 114394052184466374} sureText: {fileID: 114928939861181968} closeText: {fileID: 6414057435243776861} - uiEffect: {fileID: 5457179044987085705} --- !u!1 &1486685165425868 GameObject: m_ObjectHideFlags: 0 @@ -344,6 +343,7 @@ m_IsKey: 0 m_KeyName: m_ColorType: 7 + m_BGColorType: 0 --- !u!1 &1902862377250402 GameObject: m_ObjectHideFlags: 0 @@ -658,7 +658,7 @@ m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &600492628423766390 +--- !u!1 &458217826738138189 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -666,65 +666,63 @@ m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7135748284863759535} - - component: {fileID: 4510526858031243555} - - component: {fileID: 5457179044987085705} - m_Layer: 5 - m_Name: uiEffect + - component: {fileID: 1696388223957204961} + - component: {fileID: 5460721886139475119} + - component: {fileID: 5872875044615338394} + m_Layer: 0 + m_Name: Renderer4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7135748284863759535 +--- !u!224 &1696388223957204961 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 600492628423766390} + m_GameObject: {fileID: 458217826738138189} 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: 3404264662236909888} + m_Father: {fileID: 5737262713620190881} 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: -13.2375, y: 58.556} - m_SizeDelta: {x: 718.9192, y: 70.312} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4510526858031243555 +--- !u!222 &5460721886139475119 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 600492628423766390} - m_CullTransparentMesh: 1 ---- !u!114 &5457179044987085705 + m_GameObject: {fileID: 458217826738138189} + m_CullTransparentMesh: 0 +--- !u!114 &5872875044615338394 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 600492628423766390} + m_GameObject: {fileID: 458217826738138189} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 39dcca0c219ff5543b682ac83ebbbe74, type: 3} + m_Script: {fileID: 11500000, guid: deeb12332c062954093c24a3fab10b83, type: 3} m_Name: m_EditorClassIdentifier: - renderQueue: 4000 - effect: 7126 - target: {fileID: 0} - effectPos: {x: 0, y: 0, z: 0} - effectRot: {x: 0, y: 0, z: 0} - effectScl: {x: 1, y: 1, z: 1} - playOnAwake: 1 - loop: 1 - keep: 0 - m_MaskArea: {fileID: 0} + 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1194163072864275737 GameObject: m_ObjectHideFlags: 0 @@ -898,6 +896,72 @@ m_IsKey: 0 m_KeyName: m_ColorType: 15 + m_BGColorType: 0 +--- !u!1 &1478165835875600713 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2203946410900961542} + - component: {fileID: 7083115207167175489} + - component: {fileID: 8292780349225844519} + m_Layer: 0 + m_Name: Renderer0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2203946410900961542 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478165835875600713} + 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: 5737262713620190881} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7083115207167175489 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478165835875600713} + m_CullTransparentMesh: 0 +--- !u!114 &8292780349225844519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478165835875600713} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: deeb12332c062954093c24a3fab10b83, 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2098745717938391556 GameObject: m_ObjectHideFlags: 0 @@ -1002,6 +1066,71 @@ m_EditorClassIdentifier: itemCell: {fileID: 1094788423424822943} txtItemName: {fileID: 4887029749350933318} +--- !u!1 &2448890909302231955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7622129943866077926} + - component: {fileID: 1772020139306076775} + - component: {fileID: 5389742986173737805} + m_Layer: 0 + m_Name: Renderer2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7622129943866077926 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2448890909302231955} + 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: 5737262713620190881} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1772020139306076775 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2448890909302231955} + m_CullTransparentMesh: 0 +--- !u!114 &5389742986173737805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2448890909302231955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: deeb12332c062954093c24a3fab10b83, 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3333892498704124146 GameObject: m_ObjectHideFlags: 0 @@ -1185,6 +1314,72 @@ m_IsKey: 0 m_KeyName: m_ColorType: 15 + m_BGColorType: 0 +--- !u!1 &4209364284752568795 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7040946464309328761} + - component: {fileID: 6404877052761549056} + - component: {fileID: 7331660092099120447} + m_Layer: 0 + m_Name: Renderer3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7040946464309328761 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4209364284752568795} + 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: 5737262713620190881} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6404877052761549056 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4209364284752568795} + m_CullTransparentMesh: 0 +--- !u!114 &7331660092099120447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4209364284752568795} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: deeb12332c062954093c24a3fab10b83, 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &4266325687808988070 GameObject: m_ObjectHideFlags: 0 @@ -1234,6 +1429,124 @@ m_Name: m_EditorClassIdentifier: m_Format: 1 +--- !u!1 &4351850346951202151 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5737262713620190881} + - component: {fileID: 8581030408948422361} + - component: {fileID: 7873937977554424328} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5737262713620190881 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4351850346951202151} + 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: 2203946410900961542} + - {fileID: 1413149090759679439} + - {fileID: 7622129943866077926} + - {fileID: 7040946464309328761} + - {fileID: 1696388223957204961} + m_Father: {fileID: 3404264662236909888} + 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: -7.9, y: 45.9} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8581030408948422361 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4351850346951202151} + m_CullTransparentMesh: 1 +--- !u!114 &7873937977554424328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4351850346951202151} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: b66cf7a186d13054989b33a5c90044e4, type: 2} + 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + skeletonDataAsset: {fileID: 11400000, guid: 6547afa26c58b2b4e895e25980324041, type: 2} + additiveMaterial: {fileID: 0} + multiplyMaterial: {fileID: 0} + screenMaterial: {fileID: 0} + m_SkeletonColor: {r: 1, g: 1, b: 1, a: 1} + initialSkinName: + initialFlipX: 0 + initialFlipY: 0 + startingAnimation: animation + startingLoop: 1 + timeScale: 1 + freeze: 0 + layoutScaleMode: 0 + referenceSize: {x: 100, y: 100} + pivotOffset: {x: 0, y: 0} + referenceScale: 1 + layoutScale: 1 + rectTransformSize: {x: 100, y: 100} + editReferenceRect: 0 + updateWhenInvisible: 3 + allowMultipleCanvasRenderers: 1 + canvasRenderers: + - {fileID: 7083115207167175489} + - {fileID: 193744716766086559} + - {fileID: 1772020139306076775} + - {fileID: 6404877052761549056} + - {fileID: 5460721886139475119} + separatorSlotNames: [] + enableSeparatorSlots: 0 + separatorParts: [] + updateSeparatorPartLocation: 1 + updateSeparatorPartScale: 0 + disableMeshAssignmentOnOverride: 1 + physicsPositionInheritanceFactor: {x: 1, y: 1} + physicsRotationInheritanceFactor: 1 + physicsMovementRelativeTo: {fileID: 0} + meshGenerator: + settings: + useClipping: 1 + zSpacing: 0 + tintBlack: 0 + canvasGroupCompatible: 0 + pmaVertexColors: 1 + addNormals: 0 + calculateTangents: 0 + immutableTriangles: 0 + updateTiming: 1 + unscaledTime: 0 --- !u!1 &4734357607551871708 GameObject: m_ObjectHideFlags: 0 @@ -1317,7 +1630,7 @@ m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7135748284863759535} + - {fileID: 5737262713620190881} - {fileID: 1317300502876018952} - {fileID: 224067623567264140} - {fileID: 2129321526447523529} @@ -1599,6 +1912,7 @@ m_IsKey: 0 m_KeyName: m_ColorType: 15 + m_BGColorType: 0 --- !u!1 &6638475266116053040 GameObject: m_ObjectHideFlags: 0 @@ -1681,6 +1995,72 @@ m_IsKey: 0 m_KeyName: m_ColorType: 15 + m_BGColorType: 0 +--- !u!1 &7133709363766296092 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1413149090759679439} + - component: {fileID: 193744716766086559} + - component: {fileID: 7783457236092847796} + m_Layer: 0 + m_Name: Renderer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1413149090759679439 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7133709363766296092} + 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: 5737262713620190881} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &193744716766086559 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7133709363766296092} + m_CullTransparentMesh: 0 +--- !u!114 &7783457236092847796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7133709363766296092} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: deeb12332c062954093c24a3fab10b83, 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: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &7368862484297911849 GameObject: m_ObjectHideFlags: 0 @@ -1763,6 +2143,7 @@ m_IsKey: 0 m_KeyName: m_ColorType: 15 + m_BGColorType: 0 --- !u!1 &7805839832393170252 GameObject: m_ObjectHideFlags: 0 @@ -2020,3 +2401,4 @@ m_IsKey: 0 m_KeyName: m_ColorType: 15 + m_BGColorType: 0 -- Gitblit v1.8.0