Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu

SK_LongZhu
DESKTOP-RH64908\Administrator 2025-09-09 14:05:16 +08:00
commit 09392e174c
10 changed files with 175 additions and 172 deletions

View File

@ -108,8 +108,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: 101.399994, y: -48.4}
m_SizeDelta: {x: 236.54999, y: 165.63}
m_AnchoredPosition: {x: 98.202, y: -41.54}
m_SizeDelta: {x: 165, y: 65.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &237827222
CanvasRenderer:
@ -794,7 +794,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 170.815, y: -24.54}
m_SizeDelta: {x: 72.44861, y: 42}
m_SizeDelta: {x: 73, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3634872552215850355
CanvasRenderer:
@ -817,7 +817,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.77254903, g: 0.7294118, b: 0.627451, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -1177,7 +1177,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 47.8, y: 117.299805}
m_AnchoredPosition: {x: 47.80005, y: 117.299805}
m_SizeDelta: {x: 99, y: 179}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1442028839347931044
@ -2439,7 +2439,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.8313726, g: 0.8352942, b: 0.8352942, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -2448,11 +2448,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 42
m_FontSize: 50
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 45
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -2473,7 +2473,7 @@ MonoBehaviour:
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.454902, g: 0.36078432, b: 0.24313727, a: 0.5}
m_EffectColor: {r: 0.454902, g: 0.36078432, b: 0.24313727, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!1 &4380733769752825422
@ -2833,7 +2833,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 45
m_FontSize: 60
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
@ -3047,7 +3047,7 @@ 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: -0.0000000542805, y: -5.9}
m_AnchoredPosition: {x: -0.00000016127873, y: -5.9}
m_SizeDelta: {x: 0, y: 146.9}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &4153919401695343612
@ -4259,7 +4259,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 94.5907, y: -24.54}
m_AnchoredPosition: {x: 94.315, y: -24.54}
m_SizeDelta: {x: 60, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5511417033217248667

View File

@ -986,7 +986,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -1140,7 +1140,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -2306,7 +2306,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -3052,7 +3052,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -5619,7 +5619,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -5930,7 +5930,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -7918,7 +7918,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -8630,7 +8630,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0

View File

@ -479,8 +479,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 402.11, y: 0}
m_SizeDelta: {x: 131, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4320833339301387177
CanvasRenderer:
@ -720,8 +720,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 98, y: 0}
m_SizeDelta: {x: 66, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1952495588327230643
CanvasRenderer:
@ -948,8 +948,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 402.11, y: 0}
m_SizeDelta: {x: 131, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7422676475438108378
CanvasRenderer:
@ -1032,8 +1032,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 98, y: 0}
m_SizeDelta: {x: 66, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3520923418400653691
CanvasRenderer:
@ -1056,14 +1056,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9811321, g: 0.9811321, b: 0.9811321, a: 1}
m_Color: {r: 0, g: 0, b: 0, a: 0.29803923}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 934f215d095d3ee45913a1a02fabe1e1, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -1146,7 +1146,7 @@ RectTransform:
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_AnchoredPosition: {x: 407.11, y: 0}
m_SizeDelta: {x: 814.22, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4185124015842772771

View File

@ -1494,8 +1494,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.465, y: 4.5}
m_SizeDelta: {x: 51, y: 55}
m_AnchoredPosition: {x: 35, y: -5.008499}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0, y: 1}
--- !u!222 &7597661914399559277
CanvasRenderer:
@ -2035,8 +2035,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: 180.465, y: 4.5}
m_SizeDelta: {x: 51, y: 55}
m_AnchoredPosition: {x: 70, y: -5.008499}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5806279024719162576
CanvasRenderer:
@ -2102,14 +2102,14 @@ RectTransform:
m_GameObject: {fileID: 343048054082258022}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_Children: []
m_Father: {fileID: 4542704764870265803}
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: 0, y: 3.2600002}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 19, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7435387203531108531
@ -3284,8 +3284,8 @@ RectTransform:
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: -32.1, y: -216.8}
m_SizeDelta: {x: 170.8, y: 66.4}
m_AnchoredPosition: {x: 35, y: -198.28}
m_SizeDelta: {x: 165, y: 40.017}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7171254641941816857
CanvasRenderer:
@ -3311,7 +3311,7 @@ MonoBehaviour:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: -16
m_Bottom: -5
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 0
@ -3845,7 +3845,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 110.139496, y: -6.7535}
m_AnchoredPosition: {x: 131.2395, y: -6.261999}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2013796733490215315
@ -4981,7 +4981,7 @@ RectTransform:
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: 51, y: 55}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6857796833839124357
CanvasRenderer:
@ -5296,8 +5296,8 @@ RectTransform:
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.79999924, y: -5.3999996}
m_SizeDelta: {x: 25, y: 25}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7492130185645626316
CanvasRenderer:
@ -6011,14 +6011,14 @@ RectTransform:
m_GameObject: {fileID: 1356244570318089444}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_Children: []
m_Father: {fileID: 5865730427280896622}
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: 0, y: 3.2600002}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 17, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7341508419745938646
@ -8281,7 +8281,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 48.660496, y: -6.7535}
m_AnchoredPosition: {x: 33.7605, y: -6.261999}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5596187482372757049
@ -8496,14 +8496,14 @@ RectTransform:
m_GameObject: {fileID: 2154645806301311217}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_Children: []
m_Father: {fileID: 4384647171493258050}
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: 0, y: 3.2600002}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 17, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2175698016382161566
@ -8995,7 +8995,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 69.153496, y: -6.7535}
m_AnchoredPosition: {x: 66.2535, y: -6.261999}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &538402866801634617
@ -10837,8 +10837,8 @@ RectTransform:
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.79999924, y: -5.3999996}
m_SizeDelta: {x: 25, y: 25}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3466085166197469170
CanvasRenderer:
@ -12706,7 +12706,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 115.955, y: -3.6899986}
m_AnchoredPosition: {x: 105.55501, y: -3.1984997}
m_SizeDelta: {x: 15.37, y: 38.62}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2387354244468532727
@ -13881,7 +13881,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 58.594994, y: -3.6899986}
m_AnchoredPosition: {x: 59.445, y: -3.1984997}
m_SizeDelta: {x: 15.37, y: 38.62}
m_Pivot: {x: 0, y: 1}
--- !u!222 &8799641483744413181
@ -15361,7 +15361,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 96.835, y: -3.6899986}
m_AnchoredPosition: {x: 90.185005, y: -3.1984997}
m_SizeDelta: {x: 15.37, y: 38.62}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2614083245408253727
@ -17481,7 +17481,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 89.6465, y: -6.7535}
m_AnchoredPosition: {x: 98.746506, y: -6.261999}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &7032431449132585897
@ -17764,14 +17764,14 @@ RectTransform:
m_GameObject: {fileID: 4549682561681842310}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_Children: []
m_Father: {fileID: 3060871733936523197}
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: 0, y: 3.2600002}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 15, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6594378491657779818
@ -19017,8 +19017,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: 219.465, y: 4.5}
m_SizeDelta: {x: 51, y: 55}
m_AnchoredPosition: {x: 105, y: -5.008499}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5491032760129466373
CanvasRenderer:
@ -19804,8 +19804,8 @@ RectTransform:
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.79999924, y: -5.3999996}
m_SizeDelta: {x: 25, y: 25}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2530987622712297419
CanvasRenderer:
@ -19952,8 +19952,8 @@ RectTransform:
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.79999924, y: -5.3999996}
m_SizeDelta: {x: 25, y: 25}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2608988205152630109
CanvasRenderer:
@ -23113,8 +23113,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: 258.465, y: 4.5}
m_SizeDelta: {x: 51, y: 55}
m_AnchoredPosition: {x: 140, y: -5.008499}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0, y: 1}
--- !u!222 &3263831143116476887
CanvasRenderer:
@ -25390,8 +25390,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: 0, y: 16}
m_SizeDelta: {x: 79, y: 78}
m_AnchoredPosition: {x: 0, y: -5.008499}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0, y: 1}
--- !u!222 &600848466234428884
CanvasRenderer:
@ -26112,7 +26112,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 77.715, y: -3.6899986}
m_AnchoredPosition: {x: 74.815, y: -3.1984997}
m_SizeDelta: {x: 15.37, y: 38.62}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1180250431652902663
@ -26708,7 +26708,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 69.153496, y: -24.9535}
m_AnchoredPosition: {x: 66.2535, y: -6.261999}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &2807823039656533639
@ -28344,7 +28344,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 39.474995, y: -3.6899986}
m_AnchoredPosition: {x: 44.075, y: -3.1984997}
m_SizeDelta: {x: 15.37, y: 38.62}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4846407982270421648
@ -28769,8 +28769,8 @@ RectTransform:
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.79999924, y: -5.3999996}
m_SizeDelta: {x: 25, y: 25}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8661936968583969016
CanvasRenderer:
@ -29277,8 +29277,8 @@ RectTransform:
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.79999924, y: -5.3999996}
m_SizeDelta: {x: 25, y: 25}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8531772337496673672
CanvasRenderer:
@ -29843,8 +29843,8 @@ RectTransform:
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.79999924, y: -5.3999996}
m_SizeDelta: {x: 25, y: 25}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9009187320767652169
CanvasRenderer:
@ -30217,7 +30217,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 13.847496, y: -24.9535}
m_AnchoredPosition: {x: 1.2675018, y: -6.261999}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &6011290867557600735
@ -31239,7 +31239,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &468271566761154265
RectTransform:
m_ObjectHideFlags: 0
@ -31256,8 +31256,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: 181, y: -432.1}
m_SizeDelta: {x: 154.07, y: 42.38}
m_AnchoredPosition: {x: 170, y: -433.28}
m_SizeDelta: {x: 166, y: 40.01}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4662421970939716180
CanvasRenderer:
@ -32393,7 +32393,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 41.500496, y: -24.9535}
m_AnchoredPosition: {x: 33.7605, y: -6.261999}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &253581965169351491
@ -32956,14 +32956,14 @@ RectTransform:
m_GameObject: {fileID: 8172536735292991802}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_Children: []
m_Father: {fileID: 113903677162412178}
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: 0, y: 3.2600002}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 17, y: 24}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &208904772416857431
@ -33853,8 +33853,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: 102.465, y: 4.5}
m_SizeDelta: {x: 51, y: 55}
m_AnchoredPosition: {x: 0, y: -5.008499}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0, y: 1}
--- !u!222 &481708271341930394
CanvasRenderer:
@ -35470,8 +35470,8 @@ RectTransform:
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.79999924, y: -5.3999996}
m_SizeDelta: {x: 25, y: 25}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1487227944013532170
CanvasRenderer:
@ -35697,8 +35697,8 @@ RectTransform:
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.79999924, y: -5.3999996}
m_SizeDelta: {x: 25, y: 25}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7667836382779478172
CanvasRenderer:
@ -36077,7 +36077,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 96.806496, y: -24.9535}
m_AnchoredPosition: {x: 98.746506, y: -6.261999}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5023066457142198375
@ -36751,7 +36751,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 120.38599, y: -6.7535}
m_AnchoredPosition: {x: 1.2675018, y: -6.261999}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4570263808138761272
@ -37070,7 +37070,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 124.459496, y: -24.9535}
m_AnchoredPosition: {x: 131.2395, y: -6.261999}
m_SizeDelta: {x: 32.493, y: 32.493}
m_Pivot: {x: 0, y: 1}
--- !u!222 &9054936028145970457
@ -37144,8 +37144,8 @@ RectTransform:
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.79999924, y: -5.3999996}
m_SizeDelta: {x: 25, y: 25}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 35, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6615963955050684632
CanvasRenderer:
@ -40616,16 +40616,6 @@ PrefabInstance:
propertyPath: m_SizeDelta.x
value: 268
objectReference: {fileID: 0}
- target: {fileID: 4914193227855868971, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 39.475
objectReference: {fileID: 0}
- target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
@ -40646,67 +40636,22 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 766.8
objectReference: {fileID: 0}
- target: {fileID: 4914193227855868971, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 39.475
objectReference: {fileID: 0}
- target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1,
type: 3}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 674796108277879238}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 7062020611193656940}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 8690739934298013086}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 9116807302699510169}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 813952383691523226}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 5921026051235449203}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 5149543074701112194}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 8106910601453108957}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 3447045466679366823}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 3657686346232358223}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 674796108277879238}
- target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
@ -40762,6 +40707,61 @@ PrefabInstance:
propertyPath: m_RootBone
value:
objectReference: {fileID: 7903842969898256619}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[0]
value:
objectReference: {fileID: 674796108277879238}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[1]
value:
objectReference: {fileID: 7062020611193656940}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[2]
value:
objectReference: {fileID: 8690739934298013086}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[3]
value:
objectReference: {fileID: 9116807302699510169}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[4]
value:
objectReference: {fileID: 813952383691523226}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[5]
value:
objectReference: {fileID: 5921026051235449203}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[6]
value:
objectReference: {fileID: 5149543074701112194}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[7]
value:
objectReference: {fileID: 8106910601453108957}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[8]
value:
objectReference: {fileID: 3447045466679366823}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_Bones.Array.data[9]
value:
objectReference: {fileID: 3657686346232358223}
- target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_RootBone
value:
objectReference: {fileID: 674796108277879238}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
--- !u!4 &2768949106265165781 stripped

View File

@ -669,9 +669,9 @@ RectTransform:
m_Father: {fileID: 2932887958962627933}
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: -494.7999, y: 421.8126}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -1.7999036, y: 0.001501031}
m_SizeDelta: {x: 987.4, y: 0}
m_Pivot: {x: -0.00000007683411, y: 0.9999999}
--- !u!114 &3184966851960719010

View File

@ -215,9 +215,10 @@ function this:BindEvent()
return
end
if BattleManager.IsCanOperate() and not BattleLogic.IsEnd then
--this:ClosePanel()
BattleView.EndBattle()
BattleLogic.IsEnd = true
this:ClosePanel()
--this:ClosePanel()
end
end)
end
@ -1016,6 +1017,7 @@ end
--界面关闭时调用(用于子类重写)
function this:OnClose()
LogError("dddddddddddddddddddddd")
BattleView:OnClose()
-- 停止音效
--if this.resultSoundAudio then

View File

@ -168,10 +168,10 @@ function this.SwitchView(index)
icon.sprite=this.spLoader:LoadSprite(GetResourcePath(itemConfig.ResourceID))
local haveNum=BagManager.GetItemCountById(cost[1])
if haveNum>=cost[2] then
num.text=string.format("<color=#FCF5D3FF>%s</color>/%s", cost[2],haveNum)
num.text=string.format("<color=#FCF5D3FF>%s</color>/%s",haveNum, cost[2])
else
isCan=false
num.text=string.format("<color=#FF0011>%s</color>/%s",cost[2],haveNum)
num.text=string.format("<color=#FF0011>%s</color>/%s",haveNum,cost[2])
end
Util.AddClick(icon.gameObject,function()

View File

@ -23,7 +23,7 @@ function this:InitComponent()
this.Scrollbar= Util.GetGameObject(self.gameObject, "Scrollbar"):GetComponent("Scrollbar")
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView,Util.GetGameObject(self.gameObject, "scroll").transform,
this.cardPre, this.Scrollbar, Vector2.New(v.width, v.height), 1, 4, Vector2.New(19.32,40))
this.ScrollView.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(6.78, 27)
this.ScrollView.gameObject:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, 0)
this.ScrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5)
this.ScrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5)
this.ScrollView.moveTween.MomentumAmount = 1

View File

@ -231,8 +231,9 @@ function this.InitMonsterShow()
this.scrollView:SetData(monsterInfo, function (index, go)
local tempData = this.SingleDataShow(go, monsterInfo[index])
this.singledataList[monsterInfo[index].Id] = tempData
end,true,true)
this.scrollView:SetIndex(#monsterInfo - MonsterCampManager.monsterWave - 1)
end,true,true)
local index = #monsterInfo - MonsterCampManager.monsterWave
this.scrollView:SetIndex(index>0 and index or 0)
end
--界面关闭时调用(用于子类重写)

View File

@ -83,10 +83,10 @@ function RoleTalentPopup:GetTalentDataShow()
end
else
if breakSkillDataList[curBreakId] then
breakSkillDataList[curBreakId] = {index = curBreakId,str =breakSkillDataList[curBreakId].str .. " <color=#1F9E46>"..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
breakSkillDataList[curBreakId] = {index = curBreakId,str =breakSkillDataList[curBreakId].str .. " <color=#2F3031>"..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
else
openNum=openNum+1
breakSkillDataList[curBreakId] = {index = curBreakId,str ="<color=#1F9E46>"..titleStr..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
breakSkillDataList[curBreakId] = {index = curBreakId,str ="<color=#2F3031>"..titleStr..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>"}
end
end
else--升星
@ -126,7 +126,7 @@ function RoleTalentPopup:GetTalentDataShow()
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str =GetLanguageStrById(upStarSkillDataList[curUpStarId].str) .. "<color=#B9AC97>"..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>",isHide=false}
else
openNum=openNum+1
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str ="<color=#6a4444>"..GetLanguageStrById(titleStr).."</color>".."<color=#FFFFFF>"..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>",isHide=false}
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str ="<color=#6a4444>"..GetLanguageStrById(titleStr).."</color>".."<color=#2F3031>"..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."</color>",isHide=false}
end
end
end