Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
f850fb91b1
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0add84481daf0ef4d82ae14e3b07aa55
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
|
@ -104,7 +104,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1160826661265422651}
|
m_Father: {fileID: 1160826661265422651}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
@ -484,7 +484,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1160826661265422651}
|
m_Father: {fileID: 1160826661265422651}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
@ -2474,7 +2474,7 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1160826661265422651}
|
m_Father: {fileID: 1160826661265422651}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 1, y: 1}
|
m_AnchorMin: {x: 1, y: 1}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
|
@ -2855,6 +2855,7 @@ RectTransform:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children:
|
m_Children:
|
||||||
|
- {fileID: 3599049602624176386}
|
||||||
- {fileID: 8933159185613508280}
|
- {fileID: 8933159185613508280}
|
||||||
- {fileID: 9059419964941814418}
|
- {fileID: 9059419964941814418}
|
||||||
- {fileID: 3745660327078023259}
|
- {fileID: 3745660327078023259}
|
||||||
|
@ -2864,7 +2865,7 @@ 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: -4.8, y: 0}
|
m_AnchoredPosition: {x: 5, y: 0}
|
||||||
m_SizeDelta: {x: 929.6, y: 175.1}
|
m_SizeDelta: {x: 929.6, y: 175.1}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!222 &6025562427588020142
|
--- !u!222 &6025562427588020142
|
||||||
|
@ -3419,7 +3420,7 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 9179485860400109938}
|
- {fileID: 9179485860400109938}
|
||||||
m_Father: {fileID: 1160826661265422651}
|
m_Father: {fileID: 1160826661265422651}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
|
@ -3632,11 +3633,6 @@ PrefabInstance:
|
||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 8133986337164326410}
|
m_TransformParent: {fileID: 8133986337164326410}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
- target: {fileID: 8073956589681315700, guid: 9e34ca2105307f24b96ade2cbf305e62,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: fx_shenhun
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2033830630954937158, guid: 9e34ca2105307f24b96ade2cbf305e62,
|
- target: {fileID: 2033830630954937158, guid: 9e34ca2105307f24b96ade2cbf305e62,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
|
@ -3742,6 +3738,11 @@ PrefabInstance:
|
||||||
propertyPath: m_Pivot.y
|
propertyPath: m_Pivot.y
|
||||||
value: 0.5
|
value: 0.5
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8073956589681315700, guid: 9e34ca2105307f24b96ade2cbf305e62,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: fx_shenhun
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 9e34ca2105307f24b96ade2cbf305e62, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 9e34ca2105307f24b96ade2cbf305e62, type: 3}
|
||||||
--- !u!224 &178265486883988764 stripped
|
--- !u!224 &178265486883988764 stripped
|
||||||
|
@ -3750,3 +3751,78 @@ RectTransform:
|
||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 2179968353669353050}
|
m_PrefabInstance: {fileID: 2179968353669353050}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1001 &4406935478022353509
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 1160826661265422651}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 1446842028934486629, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: fx_zhuangbeijiemian2
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: -90
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 0add84481daf0ef4d82ae14e3b07aa55, type: 3}
|
||||||
|
--- !u!4 &3599049602624176386 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 926317640228172647, guid: 0add84481daf0ef4d82ae14e3b07aa55,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 4406935478022353509}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
|
|
@ -25,6 +25,7 @@ function RoleGodSoulLayout:InitComponent()
|
||||||
self.grid = Util.GetGameObject(self.gameObject,"bgdi/scroll/grid")
|
self.grid = Util.GetGameObject(self.gameObject,"bgdi/scroll/grid")
|
||||||
self.gridPos = self.grid:GetComponent("RectTransform").anchoredPosition
|
self.gridPos = self.grid:GetComponent("RectTransform").anchoredPosition
|
||||||
self.gridList = {}
|
self.gridList = {}
|
||||||
|
self.effectbaijin = Util.GetGameObject(self.gameObject,"bgdi/topLayout/fx_zhuangbeijiemian2")
|
||||||
end
|
end
|
||||||
|
|
||||||
function RoleGodSoulLayout:OnSortingOrderChange()
|
function RoleGodSoulLayout:OnSortingOrderChange()
|
||||||
|
@ -85,6 +86,7 @@ function RoleGodSoulLayout:OnShow()
|
||||||
self.gameObject:SetActive(true)
|
self.gameObject:SetActive(true)
|
||||||
self:SetData()
|
self:SetData()
|
||||||
Util.SetParticleSortLayer(self.bgdi,self.sortingOrder + 1)
|
Util.SetParticleSortLayer(self.bgdi,self.sortingOrder + 1)
|
||||||
|
Util.SetParticleSortLayer(self.effectbaijin,self.sortingOrder + 1)
|
||||||
end
|
end
|
||||||
|
|
||||||
function RoleGodSoulLayout:SetData()
|
function RoleGodSoulLayout:SetData()
|
||||||
|
|
Loading…
Reference in New Issue