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

dev_chengFeng
jiaoyangna 2021-12-17 17:19:58 +08:00
commit 5c042b2c60
4 changed files with 158 additions and 23 deletions

View File

@ -303,6 +303,8 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 224910735328899708} - component: {fileID: 224910735328899708}
- component: {fileID: 222512554870987520} - component: {fileID: 222512554870987520}
- component: {fileID: 1138861855276989730}
- component: {fileID: 6166598105541231173}
m_Layer: 5 m_Layer: 5
m_Name: JumpView m_Name: JumpView
m_TagString: Untagged m_TagString: Untagged
@ -328,8 +330,8 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1080, y: 120} m_SizeDelta: {x: 1080, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222512554870987520 --- !u!222 &222512554870987520
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -338,6 +340,43 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1409609373158934} m_GameObject: {fileID: 1409609373158934}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &1138861855276989730
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1409609373158934}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 1
--- !u!114 &6166598105541231173
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1409609373158934}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &1732518565762740 --- !u!1 &1732518565762740
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -427,6 +466,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 2791052388060814307} - component: {fileID: 2791052388060814307}
- component: {fileID: 7941803441609960238}
m_Layer: 5 m_Layer: 5
m_Name: content m_Name: content
m_TagString: Untagged m_TagString: Untagged
@ -451,8 +491,28 @@ RectTransform:
m_Father: {fileID: 224910735328899708} m_Father: {fileID: 224910735328899708}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1080, y: 120} m_SizeDelta: {x: 1080, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7941803441609960238
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 322891868709146489}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: 130
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1

View File

@ -303,6 +303,8 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 224910735328899708} - component: {fileID: 224910735328899708}
- component: {fileID: 222512554870987520} - component: {fileID: 222512554870987520}
- component: {fileID: 3938677528134405502}
- component: {fileID: 5944952439563680798}
m_Layer: 5 m_Layer: 5
m_Name: JumpViewNew m_Name: JumpViewNew
m_TagString: Untagged m_TagString: Untagged
@ -328,7 +330,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 912, y: 150} m_SizeDelta: {x: 912, y: 0}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!222 &222512554870987520 --- !u!222 &222512554870987520
CanvasRenderer: CanvasRenderer:
@ -338,6 +340,43 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1409609373158934} m_GameObject: {fileID: 1409609373158934}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &3938677528134405502
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1409609373158934}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 1
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 1
--- !u!114 &5944952439563680798
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1409609373158934}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &1732518565762740 --- !u!1 &1732518565762740
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -677,6 +716,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 8544544195832214425} - component: {fileID: 8544544195832214425}
- component: {fileID: 1329630828413021401}
m_Layer: 5 m_Layer: 5
m_Name: content m_Name: content
m_TagString: Untagged m_TagString: Untagged
@ -702,8 +742,28 @@ RectTransform:
m_Father: {fileID: 224910735328899708} m_Father: {fileID: 224910735328899708}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -455.78, y: 75} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 911.56, y: 150} m_SizeDelta: {x: 911.56, y: 0}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &1329630828413021401
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8472845357239642143}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: -1
m_MinHeight: 150
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1

View File

@ -2813,6 +2813,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 4339301575593033537} - component: {fileID: 4339301575593033537}
- component: {fileID: 6602616607235033540} - component: {fileID: 6602616607235033540}
- component: {fileID: 5582077711496356996}
m_Layer: 5 m_Layer: 5
m_Name: grid m_Name: grid
m_TagString: Untagged m_TagString: Untagged
@ -2836,8 +2837,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1} m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -0.000004381774, y: -0.0000022818695} m_AnchoredPosition: {x: 0, y: -0.00022563702}
m_SizeDelta: {x: 807.66, y: 0} m_SizeDelta: {x: 912, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &6602616607235033540 --- !u!114 &6602616607235033540
MonoBehaviour: MonoBehaviour:
@ -2852,16 +2853,30 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Padding: m_Padding:
m_Left: -45 m_Left: 0
m_Right: 0 m_Right: 0
m_Top: 0 m_Top: 0
m_Bottom: 0 m_Bottom: 0
m_ChildAlignment: 4 m_ChildAlignment: 1
m_Spacing: 130 m_Spacing: 0
m_ChildForceExpandWidth: 0 m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0 m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0 m_ChildControlWidth: 0
m_ChildControlHeight: 0 m_ChildControlHeight: 1
--- !u!114 &5582077711496356996
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8520515486284799054}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &8547260883273792740 --- !u!1 &8547260883273792740
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -469,8 +469,8 @@ function RewardItemSingleShowPopup:OnShow()
end end
end end
this.scroll:GetComponent("RectTransform").sizeDelta = Vector2.New(912.8,717.6) this.scroll:GetComponent("RectTransform").sizeDelta = Vector2.New(912.8,717.6)
this.equipProGridCom.spacing = 160 -- this.equipProGridCom.spacing = 160
this.equipProGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(807.7,this.equipProGridCom.spacing*(#jumpDataList)) -- this.equipProGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(807.7,this.equipProGridCom.spacing*(#jumpDataList))
else else
this.btnClose:SetActive(false) this.btnClose:SetActive(false)
this.equipQuaText.gameObject:SetActive(true) this.equipQuaText.gameObject:SetActive(true)
@ -511,11 +511,10 @@ function RewardItemSingleShowPopup:OnShow()
end end
end end
end end
this.scroll:GetComponent("RectTransform").sizeDelta = Vector2.New(912.8,600) this.scroll:GetComponent("RectTransform").sizeDelta = Vector2.New(912.8,600)
this.equipProGridCom.spacing = 130 -- if jumpDataList and #jumpDataList then
if jumpDataList and #jumpDataList then -- this.equipProGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(807.7,this.equipProGridCom.spacing*(#jumpDataList))
this.equipProGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(807.7,this.equipProGridCom.spacing*(#jumpDataList)) -- end
end
end end
this.itemView:OnOpen(false, {itemConfigData.Id,0}, 1.1, false, false, false, self.sortingOrder) this.itemView:OnOpen(false, {itemConfigData.Id,0}, 1.1, false, false, false, self.sortingOrder)
@ -540,6 +539,7 @@ function RewardItemSingleShowPopup:OnShow()
this.armorLock.gameObject:SetActive(true) this.armorLock.gameObject:SetActive(true)
this.armorLock.text = string.format("<color=%s>等级达%s后可以使用</color>", UIColorStr.RED, itemConfigData.UseLevel) this.armorLock.text = string.format("<color=%s>等级达%s后可以使用</color>", UIColorStr.RED, itemConfigData.UseLevel)
end end
ForceRebuildLayout(this.equipProGrid.transform)
end end
--获取道具种类 --获取道具种类