diff --git a/EintooAR/Assets/AssetRaw/UI/YL/UIPetInfoWindow/UIPetInfoWindow.prefab b/EintooAR/Assets/AssetRaw/UI/YL/UIPetInfoWindow/UIPetInfoWindow.prefab index e3872845..34d8b4b8 100644 --- a/EintooAR/Assets/AssetRaw/UI/YL/UIPetInfoWindow/UIPetInfoWindow.prefab +++ b/EintooAR/Assets/AssetRaw/UI/YL/UIPetInfoWindow/UIPetInfoWindow.prefab @@ -362,8 +362,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 842749186510510548} m_HandleRect: {fileID: 1568927244833269662} m_Direction: 2 - m_Value: 0 - m_Size: 0.9999999 + m_Value: 0.99997944 + m_Size: 0.9955415 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -721,6 +721,7 @@ GameObject: m_Component: - component: {fileID: 1686117929436006730} - component: {fileID: 7301926586348025527} + - component: {fileID: 4984580428990418029} m_Layer: 5 m_Name: m_goParent m_TagString: Untagged @@ -740,11 +741,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3032845434903006171} + m_Father: {fileID: 8271916881123836641} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 366.5, y: -1181.1} m_SizeDelta: {x: 700, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7301926586348025527 @@ -762,15 +763,29 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 30 + m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 350, y: 350} - m_Spacing: {x: 0, y: 25} + m_Spacing: {x: 0, y: 20} m_Constraint: 1 m_ConstraintCount: 2 +--- !u!114 &4984580428990418029 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2010555495781836665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a11df6da9317110469e84add500288b4, type: 3} + m_Name: + m_EditorClassIdentifier: + horizontalFit: 2 + verticalFit: 2 --- !u!1 &2226259163997755011 GameObject: m_ObjectHideFlags: 0 @@ -907,42 +922,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &3335989117273880227 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3032845434903006171} - m_Layer: 5 - m_Name: Group - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3032845434903006171 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3335989117273880227} - 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: 1686117929436006730} - m_Father: {fileID: 8271916881123836641} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 366.5, y: -1154} - m_SizeDelta: {x: 700, y: 300} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3689724855253407238 GameObject: m_ObjectHideFlags: 0 @@ -1152,10 +1131,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1989893004251603919} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 660, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 381.5, y: -20} + m_SizeDelta: {x: 660, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3546028383550570558 CanvasRenderer: @@ -1324,7 +1303,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1971934105336562885} + - {fileID: 7386397652882480380} - {fileID: 5444677223103793555} - {fileID: 3704015329131500542} m_Father: {fileID: 1858543574900965356} @@ -1890,10 +1869,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1989893004251603919} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 25, y: -20} + m_SizeDelta: {x: 10, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6669698830926974586 CanvasRenderer: @@ -2263,7 +2242,7 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 0} mLocalizeTargetName: TEngine.Localization.LocalizeTarget_TextMeshPro_UGUI ---- !u!1 &7420356098938187199 +--- !u!1 &7353328628115307757 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2271,10 +2250,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1971934105336562885} - - component: {fileID: 5218409724635656088} - - component: {fileID: 9173138007019277610} - - component: {fileID: 1469531024480930133} + - component: {fileID: 7386397652882480380} + - component: {fileID: 5293364562211582033} + - component: {fileID: 8441513199088194787} + - component: {fileID: 7603967156740670222} m_Layer: 5 m_Name: Title m_TagString: Untagged @@ -2282,13 +2261,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1971934105336562885 +--- !u!224 &7386397652882480380 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7420356098938187199} + m_GameObject: {fileID: 7353328628115307757} 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} @@ -2301,21 +2280,21 @@ RectTransform: m_AnchoredPosition: {x: 300, y: -38.33333} m_SizeDelta: {x: 600, y: 50} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5218409724635656088 +--- !u!222 &5293364562211582033 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7420356098938187199} + m_GameObject: {fileID: 7353328628115307757} m_CullTransparentMesh: 1 ---- !u!114 &9173138007019277610 +--- !u!114 &8441513199088194787 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7420356098938187199} + m_GameObject: {fileID: 7353328628115307757} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2400,13 +2379,13 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &1469531024480930133 +--- !u!114 &7603967156740670222 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7420356098938187199} + m_GameObject: {fileID: 7353328628115307757} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} @@ -2439,6 +2418,142 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 0} mLocalizeTargetName: TEngine.Localization.LocalizeTarget_TextMeshPro_UGUI +--- !u!1 &7420356098938187199 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1971934105336562885} + - component: {fileID: 5218409724635656088} + - component: {fileID: 9173138007019277610} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1971934105336562885 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7420356098938187199} + 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: 8271916881123836641} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 366.5, y: -40} + m_SizeDelta: {x: 733, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5218409724635656088 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7420356098938187199} + m_CullTransparentMesh: 1 +--- !u!114 &9173138007019277610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7420356098938187199} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u5BA0\u7269\u4FE1\u606F" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} + m_sharedMaterial: {fileID: -2154976526923410665, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 45 + m_fontSizeBase: 45 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7550744856088722218 GameObject: m_ObjectHideFlags: 0 @@ -2449,6 +2564,7 @@ GameObject: m_Component: - component: {fileID: 8271916881123836641} - component: {fileID: 832725498647583453} + - component: {fileID: 7741590321198518746} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -2468,10 +2584,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2334709065957925157} + - {fileID: 1971934105336562885} - {fileID: 9164996300742651407} - {fileID: 1989893004251603919} - - {fileID: 3032845434903006171} + - {fileID: 1686117929436006730} m_Father: {fileID: 3415939077169515580} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2486,7 +2602,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7550744856088722218} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Name: @@ -2505,6 +2621,20 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!114 &7741590321198518746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7550744856088722218} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 --- !u!1 &8003481851698641071 GameObject: m_ObjectHideFlags: 0 @@ -2802,142 +2932,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 0} mLocalizeTargetName: TEngine.Localization.LocalizeTarget_TextMeshPro_UGUI ---- !u!1 &8804282044569580785 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2334709065957925157} - - component: {fileID: 1215142165723918154} - - component: {fileID: 543820664720200862} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2334709065957925157 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8804282044569580785} - 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: 8271916881123836641} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 366.5, y: -40} - m_SizeDelta: {x: 733, y: 80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1215142165723918154 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8804282044569580785} - m_CullTransparentMesh: 1 ---- !u!114 &543820664720200862 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8804282044569580785} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: "\u5BA0\u7269\u4FE1\u606F" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} - m_sharedMaterial: {fileID: -2154976526923410665, guid: b2a4cf98a3bf3af45a21517ae28c2f60, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 45 - m_fontSizeBase: 45 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &9029180445311629730 GameObject: m_ObjectHideFlags: 0 diff --git a/EintooAR/Assets/Editor/I2Localization/I2Languages.asset b/EintooAR/Assets/Editor/I2Localization/I2Languages.asset index a7a1ab49..d4d40cdf 100644 --- a/EintooAR/Assets/Editor/I2Localization/I2Languages.asset +++ b/EintooAR/Assets/Editor/I2Localization/I2Languages.asset @@ -17,6 +17,60 @@ MonoBehaviour: UserAgreesToHaveItInsideThePluginsFolder: 0 GoogleLiveSyncIsUptoDate: 1 mTerms: + - Term: ar_ARFindPet + TermType: 0 + Description: + Languages: + - "AR\u5BFB\u5BA0" + - ARFindPet + - "AR\u5C0B\u5BF5" + Flags: 000000 + Languages_Touch: [] + - Term: ar_ARSelectType + TermType: 0 + Description: + Languages: + - "\u8BF7\u9009\u62E9\u54C1\u79CD" + - Please select a variety + - "\u8ACB\u9078\u64C7\u54C1\u7A2E" + Flags: 000000 + Languages_Touch: [] + - Term: ar_ARSelectZone + TermType: 0 + Description: + Languages: + - "\u8BF7\u9009\u62E9\u5730\u533A" + - Please select a region + - "\u8ACB\u9078\u64C7\u5730\u5340" + Flags: 000000 + Languages_Touch: [] + - Term: ar_ArClickCollect + TermType: 0 + Description: + Languages: + - "\u70B9\u51FB\u6536\u85CF" + - ClickCollect + - "\u9EDE\u64CA\u6536\u85CF" + Flags: 000000 + Languages_Touch: [] + - Term: ar_ArCollect + TermType: 0 + Description: + Languages: + - "\u6536\u85CF" + - Collect + - "\u6536\u85CF" + Flags: 000000 + Languages_Touch: [] + - Term: ar_ArCompany + TermType: 0 + Description: + Languages: + - "AR\u4F01\u4E1A" + - AR Company + - "AR\u4F01\u696D" + Flags: 000000 + Languages_Touch: [] - Term: ar_ArExample TermType: 0 Description: @@ -26,6 +80,15 @@ MonoBehaviour: - "AR\u6848\u4F8B" Flags: 000000 Languages_Touch: [] + - Term: ar_ArSearch + TermType: 0 + Description: + Languages: + - "\u641C\u7D22" + - Search + - "\u641C\u5C0B" + Flags: 000000 + Languages_Touch: [] - Term: ar_ArTeacher TermType: 0 Description: @@ -46,6 +109,60 @@ MonoBehaviour: - "AR\u865B\u64EC\u4EBA" Flags: 000000 Languages_Touch: [] + - Term: ar_Arself + TermType: 0 + Description: + Languages: + - "\u6211\u7684" + - Self + - "\u6211\u7684" + Flags: 000000 + Languages_Touch: [] + - Term: ar_Cancel + TermType: 0 + Description: + Languages: + - "\u53D6\u6D88" + - Cancel + - "\u53D6\u6D88" + Flags: 000000 + Languages_Touch: [] + - Term: ar_Cancle + TermType: 0 + Description: + Languages: + - "\u53D6\u6D88" + - + - + Flags: 000000 + Languages_Touch: [] + - Term: ar_Confirm + TermType: 0 + Description: + Languages: + - "\u786E\u8BA4" + - Sure + - "\u78BA\u8A8D" + Flags: 000000 + Languages_Touch: [] + - Term: ar_DeletePetInfo + TermType: 0 + Description: + Languages: + - "\u662F\u5426\u5220\u9664\u8BE5AR\u5BA0\u7269\u4FE1\u606F\uFF1F" + - Do you want to delete the AR pet information? + - "\u662F\u5426\u522A\u9664\u8A72AR\u5BF5\u7269\u4FE1\u606F\uFF1F" + Flags: 000000 + Languages_Touch: [] + - Term: ar_FindARBrochure + TermType: 0 + Description: + Languages: + - "\u627E\u4E0D\u5230\u5BA3\u4F20\u518C\uFF1F\u524D\u5F80\u641C\u7D22" + - Can't find the brochure? Go to search. + - "\u627E\u4E0D\u5230\u5BA3\u50B3\u518A\uFF1F\u524D\u5F80\u641C\u5C0B" + Flags: 000000 + Languages_Touch: [] - Term: ar_HelloWorld TermType: 0 Description: @@ -64,6 +181,60 @@ MonoBehaviour: - "\u9996\u9801" Flags: 000000 Languages_Touch: [] + - Term: ar_PetInfo + TermType: 0 + Description: + Languages: + - "\u5BA0\u7269\u4FE1\u606F" + - Pet Infomation + - "\u5BF5\u7269\u4FE1\u606F" + Flags: 000000 + Languages_Touch: [] + - Term: ar_PetInformationbank + TermType: 0 + Description: + Languages: + - "\u5BA0\u7269\u4FE1\u606F\u5E93" + - PetInformationbank + - "\u5BF5\u7269\u4FE1\u606F\u5EAB" + Flags: 000000 + Languages_Touch: [] + - Term: ar_PetOwnInfo + TermType: 0 + Description: + Languages: + - "\u5BA0\u7269\u4E3B\u4EBA\u4FE1\u606F" + - Pet owner information + - "\u5BF5\u7269\u4E3B\u4EBA\u4FE1\u606F" + Flags: 000000 + Languages_Touch: [] + - Term: ar_PlaceModel + TermType: 0 + Description: + Languages: + - "\u6A21\u578B\u653E\u7F6E" + - PlaceModel + - "\u6A21\u578B\u653E\u7F6E" + Flags: 000000 + Languages_Touch: [] + - Term: ar_PleaseInputCompanyName + TermType: 0 + Description: + Languages: + - "\u8BF7\u8F93\u5165\u516C\u53F8\u540D\u79F0\u8D27AR\u9879\u76EE\u540D\u79F0" + - Please enter the company name and the AR project name + - "\u8ACB\u8F38\u5165\u516C\u53F8\u540D\u7A31\u8CA8AR\u9805\u76EE\u540D\u7A31" + Flags: 000000 + Languages_Touch: [] + - Term: ar_ResetModel + TermType: 0 + Description: + Languages: + - "\u91CD\u7F6E" + - Reset + - "\u91CD\u7F6E" + Flags: 000000 + Languages_Touch: [] - Term: ar_Retrun TermType: 0 Description: "\u8FD9\u662F \u4E00\u4E2A \u8FD4\u56DE \u529F\u80FD" @@ -82,76 +253,49 @@ MonoBehaviour: - "\u958B\u59CB\u9AD4\u9A57" Flags: 000000 Languages_Touch: [] - - Term: ar_ArCollect + - Term: ar_Sure TermType: 0 Description: Languages: - - "\u6536\u85CF" - - Collect - - "\u6536\u85CF" + - "\u786E\u8BA4" + - Sure + - "\u78BA\u8A8D" Flags: 000000 Languages_Touch: [] - - Term: ar_ArClickCollect + - Term: ar_Tips TermType: 0 Description: Languages: - - "\u70B9\u51FB\u6536\u85CF" - - ClickCollect - - "\u9EDE\u64CA\u6536\u85CF" + - "\u63D0\u793A" + - Tip + - "\u63D0\u793A" Flags: 000000 Languages_Touch: [] - - Term: ar_ArCompany + - Term: ar_TrackImages TermType: 0 Description: Languages: - - "AR\u4F01\u4E1A" - - AR Company - - "AR\u4F01\u696D" + - "\u8BC6\u522B\u56FE\u76F8\u518C" + - Identification photo album + - Flags: 000000 Languages_Touch: [] - - Term: ar_PlaceModel + - Term: ar_addtionPet TermType: 0 Description: Languages: - - "\u6A21\u578B\u653E\u7F6E" - - PlaceModel - - "\u6A21\u578B\u653E\u7F6E" + - "\u65B0\u589E\u5BA0\u7269" + - AddtionPet + - "\u65B0\u589E\u5BF5\u7269" Flags: 000000 Languages_Touch: [] - - Term: ar_ResetModel + - Term: ar_games TermType: 0 Description: Languages: - - "\u91CD\u7F6E" - - Reset - - "\u91CD\u7F6E" - Flags: 000000 - Languages_Touch: [] - - Term: ar_FindARBrochure - TermType: 0 - Description: - Languages: - - "\u627E\u4E0D\u5230\u5BA3\u4F20\u518C\uFF1F\u524D\u5F80\u641C\u7D22" - - Can't find the brochure? Go to search. - - "\u627E\u4E0D\u5230\u5BA3\u50B3\u518A\uFF1F\u524D\u5F80\u641C\u5C0B" - Flags: 000000 - Languages_Touch: [] - - Term: ar_Arself - TermType: 0 - Description: - Languages: - - "\u6211\u7684" - - Self - - "\u6211\u7684" - Flags: 000000 - Languages_Touch: [] - - Term: ar_ArSearch - TermType: 0 - Description: - Languages: - - "\u641C\u7D22" - - Search - - "\u641C\u5C0B" + - "AR\u6E38\u620F" + - AR Games + - "AR\u904A\u6232" Flags: 000000 Languages_Touch: [] - Term: ar_historySearch @@ -163,31 +307,31 @@ MonoBehaviour: - "\u6B77\u53F2\u641C\u5C0B" Flags: 000000 Languages_Touch: [] - - Term: ar_PleaseInputCompanyName + - Term: ar_imageRecognition TermType: 0 Description: Languages: - - "\u8BF7\u8F93\u5165\u516C\u53F8\u540D\u79F0\u8D27AR\u9879\u76EE\u540D\u79F0" - - Please enter the company name and the AR project name - - "\u8ACB\u8F38\u5165\u516C\u53F8\u540D\u7A31\u8CA8AR\u9805\u76EE\u540D\u7A31" + - "AR\u8BC6\u56FE" + - AR image recognition + - "AR\u8B58\u5716" Flags: 000000 Languages_Touch: [] - - Term: ar_Cancel + - Term: ar_imageTrackTip TermType: 0 Description: Languages: - - "\u53D6\u6D88" - - Cancel - - "\u53D6\u6D88" + - "\u6ED1\u52A8\u6A21\u5757\u542F\u52A8AR\u65B0\u4F53\u9A8C" + - Slide module to start new AR experience + - "\u6ED1\u52D5\u6A21\u7D44\u555F\u52D5AR\u65B0\u9AD4\u9A57" Flags: 000000 Languages_Touch: [] - - Term: ar_Confirm + - Term: ar_intoo TermType: 0 Description: Languages: - - "\u786E\u8BA4" - - Sure - - "\u78BA\u8A8D" + - "\u82F1\u9886\u4E4B\u6D82" + - intoo + - "\u82F1\u9818\u4E4B\u5857" Flags: 000000 Languages_Touch: [] - Term: ar_languageSwitch @@ -217,42 +361,6 @@ MonoBehaviour: - "\u865B\u64EC\u4EBA" Flags: 000000 Languages_Touch: [] - - Term: ar_games - TermType: 0 - Description: - Languages: - - "AR\u6E38\u620F" - - AR Games - - "AR\u904A\u6232" - Flags: 000000 - Languages_Touch: [] - - Term: ar_intoo - TermType: 0 - Description: - Languages: - - "\u82F1\u9886\u4E4B\u6D82" - - intoo - - "\u82F1\u9818\u4E4B\u5857" - Flags: 000000 - Languages_Touch: [] - - Term: ar_imageRecognition - TermType: 0 - Description: - Languages: - - "AR\u8BC6\u56FE" - - AR image recognition - - "AR\u8B58\u5716" - Flags: 000000 - Languages_Touch: [] - - Term: ar_imageTrackTip - TermType: 0 - Description: - Languages: - - "\u6ED1\u52A8\u6A21\u5757\u542F\u52A8AR\u65B0\u4F53\u9A8C" - - Slide module to start new AR experience - - "\u6ED1\u52D5\u6A21\u7D44\u555F\u52D5AR\u65B0\u9AD4\u9A57" - Flags: 000000 - Languages_Touch: [] - Term: ar_xuanchuance TermType: 0 Description: @@ -262,114 +370,6 @@ MonoBehaviour: - "AR\u5BA3\u50B3\u518A" Flags: 000000 Languages_Touch: [] - - Term: ar_TrackImages - TermType: 0 - Description: - Languages: - - "\u8BC6\u522B\u56FE\u76F8\u518C" - - Identification photo album - - - Flags: 000000 - Languages_Touch: [] - - Term: ar_ARSelectType - TermType: 0 - Description: - Languages: - - "\u8BF7\u9009\u62E9\u54C1\u79CD" - - Please select a variety - - "\u8ACB\u9078\u64C7\u54C1\u7A2E" - Flags: 000000 - Languages_Touch: [] - - Term: ar_ARSelectZone - TermType: 0 - Description: - Languages: - - "\u8BF7\u9009\u62E9\u5730\u533A" - - Please select a region - - "\u8ACB\u9078\u64C7\u5730\u5340" - Flags: 000000 - Languages_Touch: [] - - Term: ar_Sure - TermType: 0 - Description: - Languages: - - "\u786E\u8BA4" - - Sure - - "\u78BA\u8A8D" - Flags: 000000 - Languages_Touch: [] - - Term: ar_PetInfo - TermType: 0 - Description: - Languages: - - "\u5BA0\u7269\u4FE1\u606F" - - Pet Infomation - - "\u5BF5\u7269\u4FE1\u606F" - Flags: 000000 - Languages_Touch: [] - - Term: ar_PetOwnInfo - TermType: 0 - Description: - Languages: - - "\u5BA0\u7269\u4E3B\u4EBA\u4FE1\u606F" - - Pet owner information - - "\u5BF5\u7269\u4E3B\u4EBA\u4FE1\u606F" - Flags: 000000 - Languages_Touch: [] - - Term: ar_ARFindPet - TermType: 0 - Description: - Languages: - - "AR\u5BFB\u5BA0" - - ARFindPet - - "AR\u5C0B\u5BF5" - Flags: 000000 - Languages_Touch: [] - - Term: ar_addtionPet - TermType: 0 - Description: - Languages: - - "\u65B0\u589E\u5BA0\u7269" - - AddtionPet - - "\u65B0\u589E\u5BF5\u7269" - Flags: 000000 - Languages_Touch: [] - - Term: ar_PetInformationbank - TermType: 0 - Description: - Languages: - - "\u5BA0\u7269\u4FE1\u606F\u5E93" - - PetInformationbank - - "\u5BF5\u7269\u4FE1\u606F\u5EAB" - Flags: 000000 - Languages_Touch: [] - - Term: ar_Tips - TermType: 0 - Description: - Languages: - - "\u63D0\u793A" - - Tip - - "\u63D0\u793A" - Flags: 000000 - Languages_Touch: [] - - Term: ar_DeletePetInfo - TermType: 0 - Description: - Languages: - - "\u662F\u5426\u5220\u9664\u8BE5AR\u5BA0\u7269\u4FE1\u606F\uFF1F" - - Do you want to delete the AR pet information? - - "\u662F\u5426\u522A\u9664\u8A72AR\u5BF5\u7269\u4FE1\u606F\uFF1F" - Flags: 000000 - Languages_Touch: [] - - Term: ar_Cancle - TermType: 0 - Description: - Languages: - - "\u53D6\u6D88" - - - - - Flags: 000000 - Languages_Touch: [] CaseInsensitiveTerms: 0 OnMissingTranslation: 1 mTerm_AppName: diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/Custom.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/Custom.meta new file mode 100644 index 00000000..4886d998 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/Custom.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 35dea7d9c9cfe584d97b2bec109c7512 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/Custom/CustomContentSizeFitter.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/Custom/CustomContentSizeFitter.cs new file mode 100644 index 00000000..6d7202f6 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/Custom/CustomContentSizeFitter.cs @@ -0,0 +1,175 @@ +using UnityEngine; +using UnityEngine.UI; + +// 自定义内容大小适配脚本 +public class CustomContentSizeFitter : MonoBehaviour +{ + // 适配模式枚举 + public enum FitMode + { + // 无约束 + Unconstrained, + // 最小尺寸 + MinSize, + // 首选尺寸 + PreferredSize + } + + // 水平方向的适配模式 + public FitMode horizontalFit = FitMode.Unconstrained; + // 垂直方向的适配模式 + public FitMode verticalFit = FitMode.Unconstrained; + + // 当前对象的矩形变换组件 + private RectTransform rectTransform; + // 网格布局组组件 + private GridLayoutGroup gridLayoutGroup; + + private void Awake() + { + // 获取当前对象的矩形变换组件 + rectTransform = GetComponent(); + // 获取当前对象的网格布局组组件 + gridLayoutGroup = GetComponent(); + } + + private void Update() + { + // 检查水平或垂直方向适配 + if (horizontalFit != FitMode.Unconstrained || verticalFit != FitMode.Unconstrained) + { + SetLayoutHorizontal(); + + SetLayoutVertical(); + } + } + + // 更新水平方向布局 + private void SetLayoutHorizontal() + { + // 如果水平方向无约束，不处理 + if (horizontalFit == FitMode.Unconstrained) return; + + float minWidth = 0; + + float preferredWidth = 0; + + // 如果存在网格布局组组件 + if (gridLayoutGroup != null) + { + int childCount = rectTransform.childCount; + // 如果没有子对象，不处理 + if (childCount == 0) return; + + int columnCount; + // 计算列数 + if (gridLayoutGroup.constraint == GridLayoutGroup.Constraint.FixedColumnCount) + { + columnCount = gridLayoutGroup.constraintCount; + } + else if (gridLayoutGroup.constraint == GridLayoutGroup.Constraint.FixedRowCount) + { + columnCount = Mathf.CeilToInt((float)childCount / gridLayoutGroup.constraintCount); + } + else + { + columnCount = Mathf.CeilToInt(Mathf.Sqrt(childCount)); + } + + float cellWidth = gridLayoutGroup.cellSize.x; + + float spacingX = gridLayoutGroup.spacing.x; + + float paddingLeft = gridLayoutGroup.padding.left; + + float paddingRight = gridLayoutGroup.padding.right; + + preferredWidth = columnCount * cellWidth + Mathf.Max(0, columnCount - 1) * spacingX + paddingLeft + paddingRight; + + minWidth = preferredWidth; + } + else + { + // 如果没有网格布局组组件，遍历所有子对象 + foreach (RectTransform child in rectTransform) + { + float childRight = child.anchoredPosition.x + child.sizeDelta.x; + + minWidth = Mathf.Max(minWidth, childRight); + + preferredWidth += child.sizeDelta.x; + } + } + + if (horizontalFit == FitMode.MinSize) + { + rectTransform.sizeDelta = new Vector2(minWidth, rectTransform.sizeDelta.y); + } + else if (horizontalFit == FitMode.PreferredSize) + { + rectTransform.sizeDelta = new Vector2(preferredWidth, rectTransform.sizeDelta.y); + } + } + + private void SetLayoutVertical() + { + if (verticalFit == FitMode.Unconstrained) return; + + float minHeight = 0; + + float preferredHeight = 0; + + if (gridLayoutGroup != null) + { + int childCount = rectTransform.childCount; + + if (childCount == 0) return; + + int rowCount; + if (gridLayoutGroup.constraint == GridLayoutGroup.Constraint.FixedRowCount) + { + rowCount = gridLayoutGroup.constraintCount; + } + else if (gridLayoutGroup.constraint == GridLayoutGroup.Constraint.FixedColumnCount) + { + rowCount = Mathf.CeilToInt((float)childCount / gridLayoutGroup.constraintCount); + } + else + { + rowCount = Mathf.CeilToInt((float)childCount / Mathf.CeilToInt(Mathf.Sqrt(childCount))); + } + + float cellHeight = gridLayoutGroup.cellSize.y; + + float spacingY = gridLayoutGroup.spacing.y; + + float paddingTop = gridLayoutGroup.padding.top; + + float paddingBottom = gridLayoutGroup.padding.bottom; + + preferredHeight = rowCount * cellHeight + Mathf.Max(0, rowCount - 1) * spacingY + paddingTop + paddingBottom; + + minHeight = preferredHeight; + } + else + { + foreach (RectTransform child in rectTransform) + { + float childBottom = child.anchoredPosition.y + child.sizeDelta.y; + + minHeight = Mathf.Max(minHeight, childBottom); + + preferredHeight += child.sizeDelta.y; + } + } + + if (verticalFit == FitMode.MinSize) + { + rectTransform.sizeDelta = new Vector2(rectTransform.sizeDelta.x, minHeight); + } + else if (verticalFit == FitMode.PreferredSize) + { + rectTransform.sizeDelta = new Vector2(rectTransform.sizeDelta.x, preferredHeight); + } + } +} \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/Custom/CustomContentSizeFitter.cs.meta b/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/Custom/CustomContentSizeFitter.cs.meta new file mode 100644 index 00000000..16768802 --- /dev/null +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/Custom/CustomContentSizeFitter.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a11df6da9317110469e84add500288b4 \ No newline at end of file diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/UIPetInfoWindow/UIPetInfoWindow.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/UIPetInfoWindow/UIPetInfoWindow.cs index 8313b015..62cc9b19 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/UIPetInfoWindow/UIPetInfoWindow.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/YL/UI/UIPetInfoWindow/UIPetInfoWindow.cs @@ -17,7 +17,7 @@ namespace GameLogic protected override void ScriptGenerator() { m_btnAddtionPet = FindChildComponent