fix: 突发情况图标还原 + InitCarIcon回退SetInitMsg + TerrainChange使用原始地形名
This commit is contained in:
ayuan9957
parent
1481c1c6f3
commit
0083ee2fed
@ -470,8 +470,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -397}
|
||||
m_SizeDelta: {x: 253, y: 294}
|
||||
m_AnchoredPosition: {x: 141.5, y: -387.9597}
|
||||
m_SizeDelta: {x: 253, y: 312.08057}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5111617465449708938
|
||||
CanvasRenderer:
|
||||
@ -500,8 +500,8 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 384138f1529e27e499614bc881a530a2, type: 3}
|
||||
m_Type: 0
|
||||
m_Sprite: {fileID: 21300000, guid: d5be9e5a3672a0743bb383c589da7568, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@ -1294,8 +1294,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 75, y: -79.70001}
|
||||
m_SizeDelta: {x: 120, y: 30}
|
||||
m_AnchoredPosition: {x: 105.44, y: -52.217}
|
||||
m_SizeDelta: {x: 170.8873, y: 53.642242}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6024800372643009855
|
||||
CanvasRenderer:
|
||||
@ -1328,14 +1328,14 @@ MonoBehaviour:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 22
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_BestFit: 1
|
||||
m_MinSize: 18
|
||||
m_MaxSize: 26
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u4EBA\u5458\u5E93\u6E05\u5355"
|
||||
--- !u!1 &6024800372694576825
|
||||
@ -1764,8 +1764,8 @@ RectTransform:
|
||||
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: -12}
|
||||
m_SizeDelta: {x: 0, y: -24}
|
||||
m_AnchoredPosition: {x: 0, y: -26.58}
|
||||
m_SizeDelta: {x: 0, y: -53.151947}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6024800372884269906
|
||||
CanvasRenderer:
|
||||
@ -2376,8 +2376,8 @@ RectTransform:
|
||||
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: -12}
|
||||
m_SizeDelta: {x: 0, y: -24}
|
||||
m_AnchoredPosition: {x: 0, y: -26.84}
|
||||
m_SizeDelta: {x: 0, y: -53.677002}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6024800373156703753
|
||||
CanvasRenderer:
|
||||
@ -2678,8 +2678,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 75, y: 275}
|
||||
m_SizeDelta: {x: 120, y: 30}
|
||||
m_AnchoredPosition: {x: 105.44, y: 281.41}
|
||||
m_SizeDelta: {x: 170.88727, y: 53.340088}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6024800373366773982
|
||||
CanvasRenderer:
|
||||
@ -2712,14 +2712,14 @@ MonoBehaviour:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 22
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_BestFit: 1
|
||||
m_MinSize: 18
|
||||
m_MaxSize: 26
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u88C5\u5907\u5E93\u6E05\u5355"
|
||||
--- !u!1 &6024800373398185552
|
||||
@ -4699,8 +4699,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -752}
|
||||
m_SizeDelta: {x: 253, y: 294}
|
||||
m_AnchoredPosition: {x: 141.5, y: -732.2}
|
||||
m_SizeDelta: {x: 253, y: 333.609}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6452024544864023322
|
||||
CanvasRenderer:
|
||||
@ -4729,8 +4729,8 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 384138f1529e27e499614bc881a530a2, type: 3}
|
||||
m_Type: 0
|
||||
m_Sprite: {fileID: 21300000, guid: d5be9e5a3672a0743bb383c589da7568, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
%YAML 1.1
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &303071113378937640
|
||||
GameObject:
|
||||
@ -34,8 +34,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 141.5, y: 0}
|
||||
m_SizeDelta: {x: 253, y: 484}
|
||||
m_AnchoredPosition: {x: 144, y: 15.3}
|
||||
m_SizeDelta: {x: 245, y: 514.5362}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &718708600250649797
|
||||
CanvasRenderer:
|
||||
@ -64,8 +64,8 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 26333d01e0788434f8d3a8255050c828, type: 3}
|
||||
m_Type: 0
|
||||
m_Sprite: {fileID: 21300000, guid: d5be9e5a3672a0743bb383c589da7568, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@ -367,8 +367,8 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 122, y: -315}
|
||||
m_SizeDelta: {x: 200, y: 30}
|
||||
m_AnchoredPosition: {x: 110, y: -294.93}
|
||||
m_SizeDelta: {x: 160, y: 55}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4298130451584166344
|
||||
CanvasRenderer:
|
||||
@ -401,14 +401,14 @@ MonoBehaviour:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 20
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_BestFit: 1
|
||||
m_MinSize: 18
|
||||
m_MaxSize: 26
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u88C5\u5907\u6E05\u5355"
|
||||
--- !u!1 &4298130451636066206
|
||||
|
||||
@ -189,7 +189,7 @@ RectTransform:
|
||||
- {fileID: 4302619940623038024}
|
||||
- {fileID: 4714231161202593324}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 22
|
||||
m_RootOrder: 20
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -382,14 +382,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: 2960362530237923609}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 145, y: 93}
|
||||
m_SizeDelta: {x: 253, y: 294}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -389.5}
|
||||
m_SizeDelta: {x: 253, y: 308.99054}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &731811908888160367
|
||||
CanvasRenderer:
|
||||
@ -418,8 +419,8 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: ab74fc79db65c9c4b968aa28cd38572d, type: 3}
|
||||
m_Type: 0
|
||||
m_Sprite: {fileID: 21300000, guid: d5be9e5a3672a0743bb383c589da7568, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@ -688,14 +689,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: 2960362530664835758}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 13
|
||||
m_RootOrder: 12
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 145, y: -183}
|
||||
m_SizeDelta: {x: 253, y: 207}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 141.5, y: -730.9}
|
||||
m_SizeDelta: {x: 253, y: 336.21692}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6388303822473631869
|
||||
CanvasRenderer:
|
||||
@ -724,8 +726,8 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 9cbed9ef6fcb77945a28f73d68181448, type: 3}
|
||||
m_Type: 0
|
||||
m_Sprite: {fileID: 21300000, guid: d5be9e5a3672a0743bb383c589da7568, type: 3}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
@ -993,7 +995,7 @@ RectTransform:
|
||||
- {fileID: 2655193791142219874}
|
||||
- {fileID: 3746814568151281957}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 27
|
||||
m_RootOrder: 25
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -1195,7 +1197,7 @@ RectTransform:
|
||||
- {fileID: 7212373362659418378}
|
||||
- {fileID: 3368071801064406252}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 17
|
||||
m_RootOrder: 16
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@ -1994,7 +1996,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 2960362528793865969}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 30
|
||||
m_RootOrder: 28
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -2357,7 +2359,7 @@ RectTransform:
|
||||
- {fileID: 2604150028291666819}
|
||||
- {fileID: 2960362530167045605}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 28
|
||||
m_RootOrder: 26
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -2494,7 +2496,7 @@ RectTransform:
|
||||
- {fileID: 2960362528959432797}
|
||||
- {fileID: 2960362529379643276}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 20
|
||||
m_RootOrder: 18
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@ -3249,7 +3251,7 @@ RectTransform:
|
||||
- {fileID: 3251721878439077199}
|
||||
- {fileID: 2960362529437692723}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 29
|
||||
m_RootOrder: 27
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -3366,19 +3368,19 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2960362530237923608}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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:
|
||||
- {fileID: 2960362530712822358}
|
||||
- {fileID: 2960362529026278380}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 11
|
||||
m_Father: {fileID: 5536881968226306111}
|
||||
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: -815, y: 80}
|
||||
m_SizeDelta: {x: 254, y: 270}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -26.65}
|
||||
m_SizeDelta: {x: 0, y: -53.29976}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2960362530237923612
|
||||
CanvasRenderer:
|
||||
@ -3731,19 +3733,19 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2960362530664835753}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
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:
|
||||
- {fileID: 2960362530109330577}
|
||||
- {fileID: 2960362529181011895}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 18
|
||||
m_Father: {fileID: 3187071859783398869}
|
||||
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: -815, y: -195}
|
||||
m_SizeDelta: {x: 254, y: 180}
|
||||
m_AnchoredPosition: {x: 0, y: -26.333008}
|
||||
m_SizeDelta: {x: 254, y: 283.55084}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2960362530664835757
|
||||
CanvasRenderer:
|
||||
@ -4119,12 +4121,12 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 12
|
||||
m_RootOrder: 11
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 88, y: -316}
|
||||
m_SizeDelta: {x: 200, y: 30}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 104.98, y: 278.41}
|
||||
m_SizeDelta: {x: 171.96582, y: 53.168137}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &987541003682912588
|
||||
CanvasRenderer:
|
||||
@ -4157,14 +4159,14 @@ MonoBehaviour:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 20
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_BestFit: 1
|
||||
m_MinSize: 18
|
||||
m_MaxSize: 26
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_AlignByGeometry: 1
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u88C5\u5907\u6E05\u5355"
|
||||
--- !u!1 &3342922790678737398
|
||||
@ -4309,7 +4311,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 7628334007679538717}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 32
|
||||
m_RootOrder: 30
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
@ -4530,14 +4532,12 @@ RectTransform:
|
||||
- {fileID: 9204594174391494509}
|
||||
- {fileID: 2960362529124685579}
|
||||
- {fileID: 5536881968226306111}
|
||||
- {fileID: 2960362530237923609}
|
||||
- {fileID: 8418471921468022311}
|
||||
- {fileID: 3187071859783398869}
|
||||
- {fileID: 1446201924388050494}
|
||||
- {fileID: 4483936144705967525}
|
||||
- {fileID: 3355294563430086954}
|
||||
- {fileID: 1702636095527033757}
|
||||
- {fileID: 2960362530664835758}
|
||||
- {fileID: 7482717167725771398}
|
||||
- {fileID: 2960362529532188654}
|
||||
- {fileID: 2960362530552807597}
|
||||
@ -4901,7 +4901,7 @@ RectTransform:
|
||||
- {fileID: 7222434482656470998}
|
||||
- {fileID: 8198789618806091315}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 26
|
||||
m_RootOrder: 24
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -5113,7 +5113,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 16
|
||||
m_RootOrder: 15
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@ -5395,7 +5395,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 25
|
||||
m_RootOrder: 23
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@ -5552,7 +5552,7 @@ RectTransform:
|
||||
- {fileID: 5976890439484067769}
|
||||
- {fileID: 1649262922185915369}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 31
|
||||
m_RootOrder: 29
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@ -5688,12 +5688,12 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 15
|
||||
m_RootOrder: 14
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 88, y: -95}
|
||||
m_SizeDelta: {x: 200, y: 30}
|
||||
m_AnchoredPosition: {x: 104.98, y: -51.5}
|
||||
m_SizeDelta: {x: 171.96448, y: 57.441032}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &481778499911391798
|
||||
CanvasRenderer:
|
||||
@ -5726,14 +5726,14 @@ MonoBehaviour:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 20
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_BestFit: 1
|
||||
m_MinSize: 18
|
||||
m_MaxSize: 26
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_AlignByGeometry: 1
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u9644\u5C5E\u4EBA\u5458"
|
||||
--- !u!1 &5491854209663156093
|
||||
@ -6263,7 +6263,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 6301676137386981043}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 23
|
||||
m_RootOrder: 21
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
@ -6655,7 +6655,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 19
|
||||
m_RootOrder: 17
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
@ -6810,7 +6810,7 @@ RectTransform:
|
||||
- {fileID: 8302928745935361540}
|
||||
- {fileID: 3391482199799977988}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 14
|
||||
m_RootOrder: 13
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@ -8163,7 +8163,7 @@ RectTransform:
|
||||
- {fileID: 2283375224977561922}
|
||||
- {fileID: 9190099286771187439}
|
||||
m_Father: {fileID: 9121104646511807031}
|
||||
m_RootOrder: 24
|
||||
m_RootOrder: 22
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@ -8380,7 +8380,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8402700413845883541, guid: 6556e9ad8aca9054b88aa3666ade8a10,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 21
|
||||
value: 19
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8402700413845883541, guid: 6556e9ad8aca9054b88aa3666ade8a10,
|
||||
type: 3}
|
||||
|
||||
@ -195,15 +195,12 @@ public class Subject1EditorCtrl : SubjectEditorBase
|
||||
|
||||
private void InitCarIcon()
|
||||
{
|
||||
// 先清除之前的装备图标 避免残留
|
||||
equipContent.RemoveAll();
|
||||
// 重新创建所有装备图标
|
||||
List<string> carNames = new List<string>();
|
||||
Dictionary<string, EquipIconData> selectCars = new Dictionary<string, EquipIconData>();
|
||||
for (int i = 0; i < recordClass.usedEquips.Count; i++)
|
||||
{
|
||||
carNames.Add(recordClass.usedEquips[i].name);
|
||||
selectCars[recordClass.usedEquips[i].name] = recordClass.usedEquips[i];
|
||||
}
|
||||
equipContent.CreatChildren(carNames.ToArray(), EquipIconCreatOver);
|
||||
equipContent.SetInitMsg(selectCars);
|
||||
}
|
||||
|
||||
//关闭界面时初始化界面
|
||||
|
||||
@ -12,11 +12,10 @@ public class SubjectEditorBase : BasePanel
|
||||
public Image image_Map;
|
||||
public Button button_Save;
|
||||
public Button button_finish;
|
||||
|
||||
public InputField input_TaskIntr;
|
||||
public InputField input_FileIntr;
|
||||
|
||||
private string subNameKey;
|
||||
private string[] terrainOriginalNames; // 保存原始地形名称 用于加载地图资源
|
||||
|
||||
public SubjectEditorBase(string panelName) : base(new UIType(panelName))
|
||||
{
|
||||
@ -33,6 +32,7 @@ public class SubjectEditorBase : BasePanel
|
||||
input_FileIntr = ActivePanel.Find("InputField_renwujianjie (1)").GetComponent<InputField>();
|
||||
|
||||
string[] terrainNames = DBManager.Instance.GetABNames(ABType.地形);
|
||||
terrainOriginalNames = terrainNames; // 保存原始名称
|
||||
dropdown_Terrain.options.Clear();
|
||||
for (int i = 0; i < terrainNames.Length; i++)
|
||||
{
|
||||
@ -87,7 +87,10 @@ public class SubjectEditorBase : BasePanel
|
||||
|
||||
async void TerrainChange(int terrainIndex)
|
||||
{
|
||||
Sprite sprite = await OutSpriteLoader.LoadSprite(StreamingAssetsManager.GetPath($"{dropdown_Terrain.options[terrainIndex].text}_Map"));
|
||||
string terrainName = (terrainOriginalNames != null && terrainIndex < terrainOriginalNames.Length)
|
||||
? terrainOriginalNames[terrainIndex]
|
||||
: dropdown_Terrain.options[terrainIndex].text;
|
||||
Sprite sprite = await OutSpriteLoader.LoadSprite(StreamingAssetsManager.GetPath($"{terrainName}_Map"));
|
||||
ShowTerrainMap(sprite);
|
||||
}
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ public class EditorContentCtrl : MonoBehaviour
|
||||
for (int i = 0; i < carsName.Length; i++)
|
||||
{
|
||||
IconBase icon = GetIcon(carsName[i]);
|
||||
if (unified != null)
|
||||
if (unified != null && !buildInSprite)
|
||||
icon.SetSprite(unified);
|
||||
else if (needSprite && !buildInSprite)
|
||||
{
|
||||
@ -53,7 +53,7 @@ public class EditorContentCtrl : MonoBehaviour
|
||||
{
|
||||
IconBase iconBase = GetIcon(childName);
|
||||
Sprite unified = GetUnifiedSprite();
|
||||
if (unified != null)
|
||||
if (unified != null && !buildInSprite)
|
||||
{
|
||||
iconBase.SetSprite(unified);
|
||||
}
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
- [2026-08-03 11:58:13] LocalizationManager was forcing verticalOverflow=Overflow on all Text components when applying fonts, overriding prefab's Truncate setting. Removed all 3 forced verticalOverflow assignments (in Localize(Text), Localize(Dropdown), Localize(InputField)). Must preserve prefab's original verticalOverflow setting. **Why:** user set Truncate on Image_person2 prefab Text but runtime showed Overflow because LocalizationManager overwrote it during font application.
|
||||
- [2026-08-03 17:15:04] PromptTextCtrl now has SetPromptLocalized(key, color, time, args) for real-time translation during the 3-second display window. Existing SetPrompt(msg, ...) calls with pre-translated strings do NOT update on language switch. Must use SetPromptLocalized when the prompt should re-translate while still visible. **Why:** user reported planning prompt not translating during 3s window. **How to apply:** replace SetPrompt(LocalizationManager.Get("key"), color, time) with SetPromptLocalized("key", color, time). For format strings: SetPromptLocalized("存在未规划的车辆{0}!", color, time, carName).
|
||||
- [2026-08-04 11:12:54] When editing scenario files (想定文件), InitCarIcon() must RemoveAll() then CreatChildren() to rebuild equipment icons from scratch — NOT SetInitMsg() which only updates existing icons. Panel is reused across sessions so stale icons from previous edits cause UI mismatch. **Why:** user reported equipment list UI different when editing saved scenario vs creating new one.
|
||||
- [2026-08-04 14:31:17] TerrainChange must use ORIGINAL terrain names (from DB) not translated dropdown text to find _Map resources in SAMap. OnLanguageChanged replaces dropdown text with translations but TerrainChange needs original name. SubjectEditorBase now stores terrainOriginalNames[] array. Also InitCarIcon must NOT call CreatChildren with EquipIconCreatOver callback — that creates infinite recursion (EquipIconCreatOver calls InitCarIcon). Use SetInitMsg instead.
|
||||
|
||||
### Project
|
||||
- [2026-07-23 10:59:21] User is building a multi-language localization system (Chinese/English/French/Russian) for a Unity 2019.4 military equipment repair simulation training app. Translations are stored in `Assets/StreamingAssets/Localization.xml` (external XML, ~470 entries). Code fallback in `LocalizationManager.cs`. Key patterns: `SetFormatted()` for format strings, `InjectOperateMsgLocalized()` for operation records, `IconBase.SetName()` wraps `LocalizationManager.Get()`, `PromptWindowInitData` has key+args constructor for real-time translation of popups.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user