Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-11-25 14:44:15 +08:00
commit 336321ebf3
7 changed files with 25 additions and 26 deletions

View File

@ -14610,7 +14610,7 @@ RectTransform:
m_GameObject: {fileID: 8865634440206394105}
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: 0.8}
m_Children:
- {fileID: 8454968833166725087}
m_Father: {fileID: 7816124763777208762}

View File

@ -484,7 +484,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7483443096173258523
RectTransform:
m_ObjectHideFlags: 0
@ -497,7 +497,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3309473831523017427}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -889,7 +889,6 @@ RectTransform:
m_Children:
- {fileID: 4093119420443537412}
- {fileID: 2986145042923130894}
- {fileID: 4760716640094686627}
- {fileID: 7483443096173258523}
- {fileID: 77110672082599734}
- {fileID: 5578102462485660770}
@ -1506,7 +1505,7 @@ RectTransform:
m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
m_Children: []
m_Father: {fileID: 3309473831523017427}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -4117,7 +4116,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3309473831523017427}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -4329,7 +4328,7 @@ GameObject:
m_Component:
- component: {fileID: 4760716640094686627}
- component: {fileID: 506206972616795122}
- component: {fileID: 9145494897613903450}
- component: {fileID: 8076295223848397461}
m_Layer: 5
m_Name: times
m_TagString: Untagged
@ -4348,13 +4347,13 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 3309473831523017427}
m_RootOrder: 2
m_Father: {fileID: 2986145042923130894}
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: -37.228}
m_SizeDelta: {x: 488.21, y: 52.456}
m_AnchoredPosition: {x: -0.00003671646, y: 0}
m_SizeDelta: {x: 600, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &506206972616795122
CanvasRenderer:
@ -4364,7 +4363,7 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6783907460078828264}
m_CullTransparentMesh: 0
--- !u!114 &9145494897613903450
--- !u!114 &8076295223848397461
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -4373,11 +4372,11 @@ MonoBehaviour:
m_GameObject: {fileID: 6783907460078828264}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.86666673, b: 0.6862745, a: 1}
m_Color: {r: 0.9490197, g: 0.89019614, b: 0.7411765, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -4386,11 +4385,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -4398,7 +4397,6 @@ MonoBehaviour:
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
LanguageIndex: 0
--- !u!1 &6802777975361048041
GameObject:
m_ObjectHideFlags: 0
@ -4578,15 +4576,16 @@ RectTransform:
m_GameObject: {fileID: 6935491676662411580}
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_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_Children:
- {fileID: 4760716640094686627}
m_Father: {fileID: 3309473831523017427}
m_RootOrder: 1
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: -96}
m_SizeDelta: {x: 574, y: 170}
m_AnchoredPosition: {x: 4.6, y: -40}
m_SizeDelta: {x: 600, y: 74}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9015093950070026080
CanvasRenderer:
@ -4616,7 +4615,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 8bc0409d8bb710b49bb67ad3cf8a3384, type: 3}
m_Sprite: {fileID: 21300000, guid: 50740b9a22150c2449fc4ccfc93e57c9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

View File

@ -61594,7 +61594,7 @@ RectTransform:
m_GameObject: {fileID: 7820655198797091715}
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: 0.8}
m_Children:
- {fileID: 8998886833164015041}
m_Father: {fileID: 9092643564979373074}

View File

@ -391,8 +391,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, y: -190}
m_SizeDelta: {x: 650, y: 250}
m_AnchoredPosition: {x: 0, y: -192.1}
m_SizeDelta: {x: 650, y: 311.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8492031192058166658
CanvasRenderer:

View File

@ -34,7 +34,7 @@ function LingShouBaoGe:InitComponent()
self.change = Util.GetGameObject(self.gameObject,"rightUp/change")
self.detailBtn = Util.GetGameObject(self.gameObject,"rightUp/detailBtn")
self.upper=Util.GetGameObject(self.gameObject,"bottom/times"):GetComponent("Text") ---召唤上限
self.upper=Util.GetGameObject(self.gameObject,"bottom/Image/times"):GetComponent("Text") ---召唤上限
self.tip1=Util.GetGameObject(self.gameObject,"bottom/Tip1"):GetComponent("Text") ---刷新时间
self.tip2=Util.GetGameObject(self.gameObject,"bottom/Tip2"):GetComponent("Text") ---必出
self.btnGroup=Util.GetGameObject(self.gameObject,"bottom/btngroup")