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

tcx_xiyou_solider
PC-202302260912\Administrator 2024-04-25 19:15:09 +08:00
commit ccf3046fc8
2 changed files with 84 additions and 9 deletions

View File

@ -43660,16 +43660,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1252199351641677490}
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: []
m_Father: {fileID: 2461825146493731649}
m_RootOrder: 7
m_Father: {fileID: 6676606228341209650}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -444, y: 1639}
m_AnchoredPosition: {x: -78.100006, y: 50}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2468755917181465753
@ -43693,7 +43693,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.13015783, g: 0.9528302, b: 0.1033731, a: 1}
m_Color: {r: 1, g: 0.9248581, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -43713,7 +43713,7 @@ MonoBehaviour:
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: New Text
m_Text: "New Text\n\u6BCF\u65E5\u89E3\u9501"
--- !u!114 &2014104488920720171
MonoBehaviour:
m_ObjectHideFlags: 0
@ -44239,7 +44239,7 @@ RectTransform:
- {fileID: 2461572105942810881}
- {fileID: 5508372000661152921}
- {fileID: 1647788101}
- {fileID: 5972340744719157198}
- {fileID: 6676606228341209650}
- {fileID: 3492279594617188233}
m_Father: {fileID: 0}
m_RootOrder: 0
@ -46358,7 +46358,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -391.8, y: 1591}
m_AnchoredPosition: {x: -391.8, y: 1512}
m_SizeDelta: {x: 264.3, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &982289915022788493
@ -46513,3 +46513,78 @@ MonoBehaviour:
m_EffectColor: {r: 0.32941177, g: 0.21176472, b: 0.17254902, a: 1}
m_EffectDistance: {x: 2, y: -2}
m_UseGraphicAlpha: 1
--- !u!1 &9020210402580609357
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6676606228341209650}
- component: {fileID: 2098249975068457475}
- component: {fileID: 2402287473492737032}
m_Layer: 5
m_Name: hintTxtBG
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6676606228341209650
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9020210402580609357}
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: 5972340744719157198}
m_Father: {fileID: 2461825146493731649}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: -365.9, y: 1604.3}
m_SizeDelta: {x: 413, y: 97.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2098249975068457475
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9020210402580609357}
m_CullTransparentMesh: 0
--- !u!114 &2402287473492737032
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9020210402580609357}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
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: 21300000, guid: efe1df063ef892749bbf454b3de17ece, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0

View File

@ -10,7 +10,7 @@ local npc
function FightLevelChapterPanel:InitComponent()
this.spLoader = SpriteLoader.New()
self.btnBack = Util.GetGameObject(self.gameObject, "btnBack")
this.hintTxt = Util.GetGameObject(self.gameObject, "hintTxt"):GetComponent("Text")
this.hintTxt = Util.GetGameObject(self.gameObject, "hintTxtBG/hintTxt"):GetComponent("Text")
this.maxTxt = Util.GetGameObject(self.gameObject, "maxTxt2"):GetComponent("Text")
this.maxTxt.gameObject:SetActive(true)
self.sortBtn = Util.GetGameObject(self.gameObject, "sortBtn")