Compare commits
No commits in common. "3626d3b24b31e272c6e2667597181cd14f42aeb6" and "89e681f795bd687eac789f60a9982e516497c7c1" have entirely different histories.
3626d3b24b
...
89e681f795
@ -722,7 +722,6 @@ GameObject:
|
|||||||
- component: {fileID: 3151892671755038174}
|
- component: {fileID: 3151892671755038174}
|
||||||
- component: {fileID: 3151892671755038172}
|
- component: {fileID: 3151892671755038172}
|
||||||
- component: {fileID: 3151892671755038175}
|
- component: {fileID: 3151892671755038175}
|
||||||
- component: {fileID: 4399049305747829556}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: ListItem
|
m_Name: ListItem
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -793,22 +792,3 @@ MonoBehaviour:
|
|||||||
m_FillOrigin: 0
|
m_FillOrigin: 0
|
||||||
m_UseSpriteMesh: 0
|
m_UseSpriteMesh: 0
|
||||||
m_PixelsPerUnitMultiplier: 1
|
m_PixelsPerUnitMultiplier: 1
|
||||||
--- !u!114 &4399049305747829556
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 3151892671755038169}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: ca881e1060abd064ab529ea8d7dc18ab, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
list: 0
|
|
||||||
listText: {fileID: 3151892670552190403}
|
|
||||||
listImage: {fileID: 3151892671348087528}
|
|
||||||
headImage: {fileID: 1781241705427011089}
|
|
||||||
nameText: {fileID: 3151892669938186945}
|
|
||||||
numText: {fileID: 3151892669932753418}
|
|
||||||
Bg: {fileID: 3151892671755038175}
|
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 14 KiB |
@ -1,135 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 4615bf1f4d6a9524888b2a8fec0f0dae
|
|
||||||
TextureImporter:
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 12
|
|
||||||
mipmaps:
|
|
||||||
mipMapMode: 0
|
|
||||||
enableMipMap: 0
|
|
||||||
sRGBTexture: 1
|
|
||||||
linearTexture: 0
|
|
||||||
fadeOut: 0
|
|
||||||
borderMipMap: 0
|
|
||||||
mipMapsPreserveCoverage: 0
|
|
||||||
alphaTestReferenceValue: 0.5
|
|
||||||
mipMapFadeDistanceStart: 1
|
|
||||||
mipMapFadeDistanceEnd: 3
|
|
||||||
bumpmap:
|
|
||||||
convertToNormalMap: 0
|
|
||||||
externalNormalMap: 0
|
|
||||||
heightScale: 0.25
|
|
||||||
normalMapFilter: 0
|
|
||||||
isReadable: 0
|
|
||||||
streamingMipmaps: 0
|
|
||||||
streamingMipmapsPriority: 0
|
|
||||||
vTOnly: 0
|
|
||||||
ignoreMasterTextureLimit: 0
|
|
||||||
grayScaleToAlpha: 0
|
|
||||||
generateCubemap: 6
|
|
||||||
cubemapConvolution: 0
|
|
||||||
seamlessCubemap: 0
|
|
||||||
textureFormat: 1
|
|
||||||
maxTextureSize: 2048
|
|
||||||
textureSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
filterMode: 1
|
|
||||||
aniso: 1
|
|
||||||
mipBias: 0
|
|
||||||
wrapU: 1
|
|
||||||
wrapV: 1
|
|
||||||
wrapW: 0
|
|
||||||
nPOTScale: 0
|
|
||||||
lightmap: 0
|
|
||||||
compressionQuality: 50
|
|
||||||
spriteMode: 1
|
|
||||||
spriteExtrude: 1
|
|
||||||
spriteMeshType: 1
|
|
||||||
alignment: 0
|
|
||||||
spritePivot: {x: 0.5, y: 0.5}
|
|
||||||
spritePixelsToUnits: 100
|
|
||||||
spriteBorder: {x: 56, y: 28, z: 103, w: 30}
|
|
||||||
spriteGenerateFallbackPhysicsShape: 1
|
|
||||||
alphaUsage: 1
|
|
||||||
alphaIsTransparency: 1
|
|
||||||
spriteTessellationDetail: -1
|
|
||||||
textureType: 8
|
|
||||||
textureShape: 1
|
|
||||||
singleChannelComponent: 0
|
|
||||||
flipbookRows: 1
|
|
||||||
flipbookColumns: 1
|
|
||||||
maxTextureSizeSet: 0
|
|
||||||
compressionQualitySet: 0
|
|
||||||
textureFormatSet: 0
|
|
||||||
ignorePngGamma: 0
|
|
||||||
applyGammaDecoding: 0
|
|
||||||
cookieLightType: 0
|
|
||||||
platformSettings:
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: DefaultTexturePlatform
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Standalone
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: Android
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
- serializedVersion: 3
|
|
||||||
buildTarget: WebGL
|
|
||||||
maxTextureSize: 2048
|
|
||||||
resizeAlgorithm: 0
|
|
||||||
textureFormat: -1
|
|
||||||
textureCompression: 1
|
|
||||||
compressionQuality: 50
|
|
||||||
crunchedCompression: 0
|
|
||||||
allowsAlphaSplitting: 0
|
|
||||||
overridden: 0
|
|
||||||
androidETC2FallbackOverride: 0
|
|
||||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
||||||
spriteSheet:
|
|
||||||
serializedVersion: 2
|
|
||||||
sprites: []
|
|
||||||
outline: []
|
|
||||||
physicsShape: []
|
|
||||||
bones: []
|
|
||||||
spriteID: 5e97eb03825dee720800000000000000
|
|
||||||
internalID: 1537655665
|
|
||||||
vertices: []
|
|
||||||
indices:
|
|
||||||
edges: []
|
|
||||||
weights: []
|
|
||||||
secondaryTextures: []
|
|
||||||
nameFileIdTable: {}
|
|
||||||
spritePackingTag:
|
|
||||||
pSDRemoveMatte: 0
|
|
||||||
pSDShowRemoveMatteOption: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
@ -306,11 +306,6 @@ MonoBehaviour:
|
|||||||
parent2: {fileID: 769264874}
|
parent2: {fileID: 769264874}
|
||||||
Orparent1: {fileID: 400236064}
|
Orparent1: {fileID: 400236064}
|
||||||
Orparent2: {fileID: 326865757}
|
Orparent2: {fileID: 326865757}
|
||||||
ListItemPre: {fileID: 3151892671755038169, guid: bf260e5f2fdb1fd4ab4d66d5c75e79a2, type: 3}
|
|
||||||
ItemList: []
|
|
||||||
CreateParentToDay: {fileID: 1282886001}
|
|
||||||
CreateParentLastDay: {fileID: 67039494}
|
|
||||||
SelfList: {fileID: 1201875112}
|
|
||||||
--- !u!114 &12243720
|
--- !u!114 &12243720
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -2351,10 +2346,10 @@ RectTransform:
|
|||||||
m_Father: {fileID: 385193887}
|
m_Father: {fileID: 385193887}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 1043.4, y: -89.5}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 255, y: 165}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &143179106
|
--- !u!114 &143179106
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -3981,10 +3976,10 @@ RectTransform:
|
|||||||
m_Father: {fileID: 385193887}
|
m_Father: {fileID: 385193887}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 647.95, y: -312.84}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 255, y: 165}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &245899061
|
--- !u!114 &245899061
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -17663,7 +17658,6 @@ GameObject:
|
|||||||
- component: {fileID: 1201875109}
|
- component: {fileID: 1201875109}
|
||||||
- component: {fileID: 1201875111}
|
- component: {fileID: 1201875111}
|
||||||
- component: {fileID: 1201875110}
|
- component: {fileID: 1201875110}
|
||||||
- component: {fileID: 1201875112}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: ListItem
|
m_Name: ListItem
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -17734,26 +17728,6 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1201875108}
|
m_GameObject: {fileID: 1201875108}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
--- !u!114 &1201875112
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1201875108}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: ca881e1060abd064ab529ea8d7dc18ab, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
list: 0
|
|
||||||
listText: {fileID: 0}
|
|
||||||
listImage: {fileID: 0}
|
|
||||||
headImage: {fileID: 0}
|
|
||||||
nameText: {fileID: 0}
|
|
||||||
numText: {fileID: 0}
|
|
||||||
Bg: {fileID: 0}
|
|
||||||
headPath:
|
|
||||||
--- !u!1 &1219510706
|
--- !u!1 &1219510706
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -21112,82 +21086,6 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1457829062}
|
m_GameObject: {fileID: 1457829062}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &1465102437
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 1465102438}
|
|
||||||
- component: {fileID: 1465102440}
|
|
||||||
- component: {fileID: 1465102439}
|
|
||||||
m_Layer: 5
|
|
||||||
m_Name: headImage
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!224 &1465102438
|
|
||||||
RectTransform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1465102437}
|
|
||||||
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_ConstrainProportionsScale: 0
|
|
||||||
m_Children: []
|
|
||||||
m_Father: {fileID: 1937403456}
|
|
||||||
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: 0}
|
|
||||||
m_SizeDelta: {x: 110, y: 110}
|
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
|
||||||
--- !u!114 &1465102439
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1465102437}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_Material: {fileID: 0}
|
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
m_RaycastTarget: 1
|
|
||||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
||||||
m_Maskable: 1
|
|
||||||
m_OnCullStateChanged:
|
|
||||||
m_PersistentCalls:
|
|
||||||
m_Calls: []
|
|
||||||
m_Sprite: {fileID: 0}
|
|
||||||
m_Type: 0
|
|
||||||
m_PreserveAspect: 0
|
|
||||||
m_FillCenter: 1
|
|
||||||
m_FillMethod: 4
|
|
||||||
m_FillAmount: 1
|
|
||||||
m_FillClockwise: 1
|
|
||||||
m_FillOrigin: 0
|
|
||||||
m_UseSpriteMesh: 0
|
|
||||||
m_PixelsPerUnitMultiplier: 1
|
|
||||||
--- !u!222 &1465102440
|
|
||||||
CanvasRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1465102437}
|
|
||||||
m_CullTransparentMesh: 1
|
|
||||||
--- !u!1 &1465281021
|
--- !u!1 &1465281021
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -22366,10 +22264,10 @@ RectTransform:
|
|||||||
m_Father: {fileID: 385193887}
|
m_Father: {fileID: 385193887}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 647.95, y: -89.5}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 255, y: 165}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1545419445
|
--- !u!114 &1545419445
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -23438,10 +23336,10 @@ RectTransform:
|
|||||||
m_Father: {fileID: 385193887}
|
m_Father: {fileID: 385193887}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 252.5, y: -312.84}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 255, y: 165}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1589406869
|
--- !u!114 &1589406869
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -23941,10 +23839,10 @@ RectTransform:
|
|||||||
m_Father: {fileID: 385193887}
|
m_Father: {fileID: 385193887}
|
||||||
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, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 252.5, y: -89.5}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 255, y: 165}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1636140092
|
--- !u!114 &1636140092
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -27321,10 +27219,10 @@ RectTransform:
|
|||||||
m_Father: {fileID: 385193887}
|
m_Father: {fileID: 385193887}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 5
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 0}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 1043.4, y: -312.84}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 255, y: 165}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1845977112
|
--- !u!114 &1845977112
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -28301,7 +28199,7 @@ GameObject:
|
|||||||
- component: {fileID: 1937403458}
|
- component: {fileID: 1937403458}
|
||||||
- component: {fileID: 1937403457}
|
- component: {fileID: 1937403457}
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: HeadImageBg
|
m_Name: HeadImage
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
@ -28318,15 +28216,14 @@ 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_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children: []
|
||||||
- {fileID: 1465102438}
|
|
||||||
m_Father: {fileID: 1201875109}
|
m_Father: {fileID: 1201875109}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.5}
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
m_AnchorMax: {x: 0, y: 0.5}
|
m_AnchorMax: {x: 0, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 254, y: 0}
|
m_AnchoredPosition: {x: 254, y: 0}
|
||||||
m_SizeDelta: {x: 136, y: 136}
|
m_SizeDelta: {x: 130, y: 129}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1937403457
|
--- !u!114 &1937403457
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -28348,7 +28245,7 @@ MonoBehaviour:
|
|||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Sprite: {fileID: 21300000, guid: 162542e43ec53e64f8ab0588c5e31b2c, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 41740149c4c9a4240963fdf7eec87f9d, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -43,8 +43,6 @@ public class AllHouseContro : MonoBehaviour
|
|||||||
public bool IsHideLoadPanel;//是否关闭加载页面
|
public bool IsHideLoadPanel;//是否关闭加载页面
|
||||||
|
|
||||||
public List<int> KillNos;//击杀房间列表
|
public List<int> KillNos;//击杀房间列表
|
||||||
|
|
||||||
public ListPanel listPanel;
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
async void Start()
|
async void Start()
|
||||||
{
|
{
|
||||||
@ -451,8 +449,7 @@ public class AllHouseContro : MonoBehaviour
|
|||||||
Debug.Log("5.1.8: 请求参数:"+ JsonUtility.ToJson(body)+"服务端返回"+ response);
|
Debug.Log("5.1.8: 请求参数:"+ JsonUtility.ToJson(body)+"服务端返回"+ response);
|
||||||
ServerResponse518 serverResponse_518 = JsonConvert.DeserializeObject<ServerResponse518>(response);
|
ServerResponse518 serverResponse_518 = JsonConvert.DeserializeObject<ServerResponse518>(response);
|
||||||
|
|
||||||
//listPanel.CreateListItem(serverResponse_518.data.gameEscapeUserBetResponseVoLists, listPanel.CreateParentToDay);
|
|
||||||
//listPanel.SetSelfList(serverResponse_518.data.userBetInfo);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -13,11 +13,10 @@ public class ListItem : MonoBehaviour
|
|||||||
public TextMeshProUGUI nameText;//名字
|
public TextMeshProUGUI nameText;//名字
|
||||||
public TextMeshProUGUI numText;//蜗牛蛋数量
|
public TextMeshProUGUI numText;//蜗牛蛋数量
|
||||||
public Image Bg;//背景图片
|
public Image Bg;//背景图片
|
||||||
public string headPath;//头像路径
|
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
SetListImage();
|
|
||||||
ListBgImage();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetListImage()//设排名徽章背景颜色
|
public void SetListImage()//设排名徽章背景颜色
|
||||||
@ -42,14 +41,7 @@ public class ListItem : MonoBehaviour
|
|||||||
}
|
}
|
||||||
public void ListBgImage()//设排名徽章背景颜色
|
public void ListBgImage()//设排名徽章背景颜色
|
||||||
{
|
{
|
||||||
if (list!=1&&list%2==0)//偶数排名
|
|
||||||
{
|
|
||||||
Bg.sprite = Resources.Load<Sprite>("bgbuleT");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Bg.sprite = Resources.Load<Sprite>("bgWhite");
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -83,7 +83,7 @@ public class HistoryPanel : BasePanel
|
|||||||
if (!exists)
|
if (!exists)
|
||||||
{
|
{
|
||||||
journalPanels.Add(newPanel);
|
journalPanels.Add(newPanel);
|
||||||
|
Debug.Log("加入一个面板到列表");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -19,14 +19,6 @@ public class ListPanel : BasePanel
|
|||||||
public Transform parent2;
|
public Transform parent2;
|
||||||
public Transform Orparent1;//覩迦만膠竟
|
public Transform Orparent1;//覩迦만膠竟
|
||||||
public Transform Orparent2;
|
public Transform Orparent2;
|
||||||
|
|
||||||
public GameObject ListItemPre;//排行预制体
|
|
||||||
public List<GameObject> ItemList;
|
|
||||||
|
|
||||||
public Transform CreateParentToDay;
|
|
||||||
public Transform CreateParentLastDay;
|
|
||||||
|
|
||||||
public ListItem SelfList;//自己排名
|
|
||||||
public override void Start()
|
public override void Start()
|
||||||
{
|
{
|
||||||
base.Start();
|
base.Start();
|
||||||
@ -93,60 +85,4 @@ public class ListPanel : BasePanel
|
|||||||
tog2.SetParent(parent2);
|
tog2.SetParent(parent2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void CreateListItem(List<gameEscapeUserBetResponseVoList> gameData,Transform parent)
|
|
||||||
{
|
|
||||||
foreach (gameEscapeUserBetResponseVoList item in gameData)
|
|
||||||
{
|
|
||||||
|
|
||||||
GameObject newPanel = Instantiate(ListItemPre, parent);
|
|
||||||
|
|
||||||
|
|
||||||
ListItem panelComponent = newPanel.GetComponent<ListItem>();
|
|
||||||
|
|
||||||
// 设置实例化对象的内容
|
|
||||||
panelComponent.list=item.orderNo;
|
|
||||||
panelComponent.nameText.text=item.nickName;
|
|
||||||
panelComponent.nameText.text = item.bet.ToString();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// 判断是否已存在
|
|
||||||
bool exists = false;
|
|
||||||
foreach (GameObject panel in ItemList)
|
|
||||||
{
|
|
||||||
if (panel.GetComponent<ListItem>().list == item.orderNo)
|
|
||||||
{
|
|
||||||
exists = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 如果不存在,则添加到列表
|
|
||||||
if (!exists)
|
|
||||||
{
|
|
||||||
ItemList.Add(newPanel);
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// 如果已存在,可以根据需求决定是否销毁该实例
|
|
||||||
Destroy(newPanel);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void SetSelfList(userBetInfo info)
|
|
||||||
{
|
|
||||||
SelfList.list=info.orderNo;
|
|
||||||
SelfList.nameText.text=info.nickName;
|
|
||||||
SelfList.numText.text=info.bet.ToString();
|
|
||||||
SelfList.headPath = info.headImg;
|
|
||||||
|
|
||||||
SelfList.SetListImage();
|
|
||||||
SelfList.ListBgImage();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user