【命格】提交
parent
f444315fee
commit
d91811a555
Binary file not shown.
After Width: | Height: | Size: 4.2 KiB |
|
@ -0,0 +1,99 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 11b00254f3316334199a584ee53ac7db
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
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
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
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: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5249cddf491db9f479c5f9ab533671f8
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: GemAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 4.2 KiB |
|
@ -0,0 +1,99 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fa8416faca1ba5248811c284f9ab9a7c
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
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
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
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: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: f15bb908c02bf3449abf6ca086a7f45a
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: GemAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 26 KiB |
|
@ -0,0 +1,99 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c6eedda0bfaaff345ba6276800e92844
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
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
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
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: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: e73b37ee36e2d0b4185edf8044c05aff
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: PublicAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -9700,7 +9700,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -93, y: 351.5}
|
||||
m_SizeDelta: {x: 127, y: 126}
|
||||
m_SizeDelta: {x: 128, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &659177518895935053
|
||||
CanvasRenderer:
|
||||
|
@ -9730,7 +9730,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: 049027c3ae7174b4ead9dd4e5f17b062, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: c6eedda0bfaaff345ba6276800e92844, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
@ -716,9 +716,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3070440297335827591}
|
||||
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: -409.9, y: 66.79999}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 130.1, y: 66.79999}
|
||||
m_SizeDelta: {x: 132, y: 132}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &115220811874331196
|
||||
|
@ -1535,9 +1535,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3070440297335827591}
|
||||
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}
|
||||
m_AnchoredPosition: {x: -417.7, y: -144.5}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 122.29999, y: -144.5}
|
||||
m_SizeDelta: {x: 132, y: 132}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4807381037633912922
|
||||
|
@ -3163,9 +3163,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3070440297335827591}
|
||||
m_RootOrder: 7
|
||||
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: 338.9, y: -352.40002}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -201.1, y: -352.40002}
|
||||
m_SizeDelta: {x: 132, y: 132}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4985587169127647268
|
||||
|
@ -4547,9 +4547,9 @@ RectTransform:
|
|||
m_Father: {fileID: 4110496243653304681}
|
||||
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}
|
||||
m_AnchoredPosition: {x: 0, y: -758}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 202}
|
||||
m_SizeDelta: {x: 1080, y: 164}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &9210734440724959872
|
||||
|
@ -4874,9 +4874,9 @@ RectTransform:
|
|||
m_Father: {fileID: 4110496243653304681}
|
||||
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}
|
||||
m_AnchoredPosition: {x: 0, y: -550}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 420}
|
||||
m_SizeDelta: {x: 1080, y: 300}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7856299532692921519
|
||||
|
@ -5118,9 +5118,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3070440297335827591}
|
||||
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: -278.1, y: 279.6}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 261.9, y: 279.6}
|
||||
m_SizeDelta: {x: 132, y: 132}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5279897570224105672
|
||||
|
@ -5371,6 +5371,154 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &3553171381771816844
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 225546982228497842}
|
||||
- component: {fileID: 4743787371954445666}
|
||||
- component: {fileID: 2455115748795783857}
|
||||
m_Layer: 5
|
||||
m_Name: Image (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &225546982228497842
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3553171381771816844}
|
||||
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1535527825289263518}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 230, y: 40}
|
||||
m_SizeDelta: {x: 462, y: 834}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4743787371954445666
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3553171381771816844}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2455115748795783857
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3553171381771816844}
|
||||
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: 06d1a72f00886744a821764ec2f5a63a, 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
|
||||
--- !u!1 &3636126816529225493
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1739992671986522819}
|
||||
- component: {fileID: 5156061817342554812}
|
||||
- component: {fileID: 1380504116566017418}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1739992671986522819
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3636126816529225493}
|
||||
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: 1535527825289263518}
|
||||
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: -234, y: 40}
|
||||
m_SizeDelta: {x: 462, y: 834}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5156061817342554812
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3636126816529225493}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1380504116566017418
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3636126816529225493}
|
||||
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: 06d1a72f00886744a821764ec2f5a63a, 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
|
||||
--- !u!1 &3732369536756773755
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -5899,9 +6047,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3070440297335827591}
|
||||
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}
|
||||
m_AnchoredPosition: {x: -338.9, y: -352.40002}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 201.1, y: -352.40002}
|
||||
m_SizeDelta: {x: 132, y: 132}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1207860251665182755
|
||||
|
@ -6543,9 +6691,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3070440297335827591}
|
||||
m_RootOrder: 6
|
||||
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: 417.7, y: -144.5}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -122.29999, y: -144.5}
|
||||
m_SizeDelta: {x: 132, y: 132}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4516223644380396450
|
||||
|
@ -9902,6 +10050,8 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 7625347215105360505}
|
||||
- {fileID: 1739992671986522819}
|
||||
- {fileID: 225546982228497842}
|
||||
m_Father: {fileID: 4110496243653304681}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -11224,9 +11374,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3070440297335827591}
|
||||
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}
|
||||
m_AnchoredPosition: {x: 278.1, y: 279.6}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -261.9, y: 279.6}
|
||||
m_SizeDelta: {x: 132, y: 132}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3396017016589444421
|
||||
|
@ -11843,9 +11993,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3070440297335827591}
|
||||
m_RootOrder: 5
|
||||
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: 409.9, y: 66.79999}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -130.1, y: 66.79999}
|
||||
m_SizeDelta: {x: 132, y: 132}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4433004148943562282
|
||||
|
|
|
@ -4457,7 +4457,7 @@ 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: 250, y: 0}
|
||||
m_AnchoredPosition: {x: 200, y: 0}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &488848314149753758
|
||||
|
@ -4901,7 +4901,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: 0, y: -25}
|
||||
m_AnchoredPosition: {x: 0, y: -35}
|
||||
m_SizeDelta: {x: 100, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2946128903959973776
|
||||
|
@ -4925,7 +4925,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 0.5372549, b: 0.03529412, a: 1}
|
||||
m_Color: {r: 0.9843137, g: 0.91764706, b: 0.7882353, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -4933,8 +4933,8 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 35
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
|
@ -7805,7 +7805,7 @@ 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: -130, y: 0}
|
||||
m_AnchoredPosition: {x: -220, y: 0}
|
||||
m_SizeDelta: {x: 363.8, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8660002610257417403
|
||||
|
@ -7837,7 +7837,7 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
@ -11159,7 +11159,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 450, y: -85}
|
||||
m_SizeDelta: {x: 900, y: 70}
|
||||
m_SizeDelta: {x: 900, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3066685201759749576
|
||||
CanvasRenderer:
|
||||
|
@ -11312,7 +11312,7 @@ 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: -250, y: 0}
|
||||
m_AnchoredPosition: {x: -200, y: 0}
|
||||
m_SizeDelta: {x: 150, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1821240849855915813
|
||||
|
@ -13546,7 +13546,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: 0, y: -25}
|
||||
m_AnchoredPosition: {x: 0, y: -35}
|
||||
m_SizeDelta: {x: 100, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5389486465179213322
|
||||
|
@ -13570,7 +13570,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 0.5372549, b: 0.03529412, a: 1}
|
||||
m_Color: {r: 0.9843137, g: 0.91764706, b: 0.7882353, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -13578,8 +13578,8 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 35
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
|
@ -15246,7 +15246,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 0.5372549, b: 0.03529412, a: 1}
|
||||
m_Color: {r: 0.9843137, g: 0.96862745, b: 0.94509804, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -15923,7 +15923,7 @@ MonoBehaviour:
|
|||
m_ChildAlignment: 1
|
||||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 900, y: 70}
|
||||
m_CellSize: {x: 900, y: 60}
|
||||
m_Spacing: {x: 0, y: 0}
|
||||
m_Constraint: 0
|
||||
m_ConstraintCount: 2
|
||||
|
@ -16735,7 +16735,7 @@ RectTransform:
|
|||
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: 336, y: 184}
|
||||
m_SizeDelta: {x: 70, y: 52}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2177540483540763740
|
||||
CanvasRenderer:
|
||||
|
@ -16765,7 +16765,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: 1876286e37a2d744babef5f211b909de, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: fa8416faca1ba5248811c284f9ab9a7c, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -25092,7 +25092,7 @@ 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: 22, y: 0}
|
||||
m_AnchoredPosition: {x: -13, y: 0}
|
||||
m_SizeDelta: {x: 50, y: 52}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1642886374782965507
|
||||
|
@ -29287,7 +29287,7 @@ 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: 105.100006, y: 0}
|
||||
m_AnchoredPosition: {x: 86, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7864946296345832735
|
||||
|
@ -32284,7 +32284,7 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 40
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
@ -37053,7 +37053,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9843137, g: 0.96862745, b: 0.94509804, a: 1}
|
||||
m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
@ -37061,7 +37061,7 @@ MonoBehaviour:
|
|||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 34
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
@ -37128,7 +37128,7 @@ MonoBehaviour:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8595047917154968388}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
|
|
|
@ -83,7 +83,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_HorizontalFit: 0
|
||||
m_HorizontalFit: 2
|
||||
m_VerticalFit: 2
|
||||
--- !u!1 &293372740631311891
|
||||
GameObject:
|
||||
|
@ -2283,7 +2283,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 50
|
||||
m_Left: 40
|
||||
m_Right: 0
|
||||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
|
@ -2291,7 +2291,7 @@ MonoBehaviour:
|
|||
m_StartCorner: 0
|
||||
m_StartAxis: 0
|
||||
m_CellSize: {x: 250, y: 50}
|
||||
m_Spacing: {x: 0, y: 0}
|
||||
m_Spacing: {x: 50, y: 0}
|
||||
m_Constraint: 1
|
||||
m_ConstraintCount: 2
|
||||
--- !u!114 &159784019866316574
|
||||
|
|
|
@ -24408,7 +24408,7 @@ 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: -106, y: 109}
|
||||
m_AnchoredPosition: {x: -200, y: 109}
|
||||
m_SizeDelta: {x: 384.31, y: 64.41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7769237368547173775
|
||||
|
@ -25738,7 +25738,7 @@ 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: -102, y: 111}
|
||||
m_AnchoredPosition: {x: -196, y: 111}
|
||||
m_SizeDelta: {x: 75, y: 75}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &642133615138749649
|
||||
|
@ -27478,7 +27478,7 @@ 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: 7, y: 109}
|
||||
m_AnchoredPosition: {x: -87, y: 109}
|
||||
m_SizeDelta: {x: 139, y: 64.4}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &609602437261054751
|
||||
|
@ -37746,7 +37746,7 @@ 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: -106, y: 177}
|
||||
m_AnchoredPosition: {x: -200, y: 177}
|
||||
m_SizeDelta: {x: 384.31, y: 64.41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5515120521389954641
|
||||
|
@ -52178,7 +52178,7 @@ 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: -106, y: 44}
|
||||
m_AnchoredPosition: {x: -200, y: 44}
|
||||
m_SizeDelta: {x: 384.31, y: 64.41}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3157303353954828202
|
||||
|
|
|
@ -38152,9 +38152,9 @@ RectTransform:
|
|||
m_Father: {fileID: 8503549196898394800}
|
||||
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}
|
||||
m_AnchoredPosition: {x: 0, y: -758}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 202}
|
||||
m_SizeDelta: {x: 1080, y: 164}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1045508418924788606
|
||||
|
|
|
@ -122,9 +122,9 @@ function BagPanel:BindEvent()
|
|||
Util.AddClick(this.oneKey, function()
|
||||
local list,num = GemManager.OneKeyConpound()
|
||||
-- LogGreen("金币:"..tostring(num))
|
||||
for key, value in pairs(list) do
|
||||
LogPink("key:"..tostring(key).." Value:"..tostring(value))
|
||||
end
|
||||
-- for key, value in pairs(list) do
|
||||
-- LogPink("key:"..tostring(key).." Value:"..tostring(value))
|
||||
-- end
|
||||
if num <= 0 then
|
||||
PopupTipPanel.ShowTip("无可合成的命石或金币不足!")
|
||||
return
|
||||
|
|
|
@ -165,7 +165,7 @@ function this.DoCircle1(finalList,data)
|
|||
local needMoneyNum = curGemNum/tempData.UpgradeNum * tempData.UpgradeCost[2]--按照命石可合成的数量,要花费的金币
|
||||
local curMoneyNum = BagManager.GetTotalItemNum(tempData.UpgradeCost[1])--当前金币数量
|
||||
if needMoneyNum + totalMoney > curMoneyNum then--如果当前金币不足要花费的数量,计算可以合成几个
|
||||
local upNum = (curMoneyNum - totalMoney)/tempData.UpgradeCost[2]--实际真的合成了几个
|
||||
local upNum = math.floor((curMoneyNum - totalMoney)/tempData.UpgradeCost[2])--实际真的合成了几个
|
||||
totalMoney = totalMoney + upNum*tempData.UpgradeCost[2]--金币计入总数
|
||||
local endCostNum = upNum*tempData.UpgradeNum--例如命石数量可消耗6,实际合成2,要把未使用的4加入最终list
|
||||
if lastGNum > endCostNum then
|
||||
|
@ -196,35 +196,43 @@ function this.FastConpound(id)
|
|||
local configMap = this.GetMapOfBagData()[gemConfig[id].Type]
|
||||
local selectLv = gemConfig[id].Level
|
||||
local lastGNum = 0--上一次合成出来的数量
|
||||
for i = 1, #configMap do
|
||||
local tempData = configMap[i]
|
||||
if tempData.Level >= selectLv then
|
||||
break
|
||||
end
|
||||
local bagGemNum = BagManager.GetTotalItemNum(tempData.Id)--当前背包中数量
|
||||
local curGemNum = 0--当前可使用合成的该等级的Gem数量
|
||||
if bagGemNum > 0 then
|
||||
curGemNum = bagGemNum + lastGNum--当前一共拥有命石数量(包括已经合成的数量)
|
||||
end
|
||||
if curGemNum < tempData.UpgradeNum then--如果出现断层,需要清空数据继续遍历,
|
||||
finalList = {}
|
||||
totalMoney = 0
|
||||
lastGNum = 0
|
||||
if selectLv == 1 then
|
||||
finalList[id] = BagManager.GetTotalItemNum(id) > 0 and 1 or 0
|
||||
local num = BagManager.isBagPanel and 1 or 0
|
||||
if BagManager.GetTotalItemNum(id) > num then
|
||||
finalList[id] = 1
|
||||
lastGNum = 1
|
||||
else
|
||||
local needNum = this.DoCircle2(tempData.Type,tempData.Level,selectLv)
|
||||
local remainNum = curGemNum%tempData.UpgradeNum
|
||||
if curGemNum > needNum then
|
||||
remainNum = curGemNum - needNum
|
||||
curGemNum = needNum
|
||||
finalList[id] = 0
|
||||
lastGNum = 1
|
||||
end
|
||||
else
|
||||
for i = 1, #configMap do
|
||||
local tempData = configMap[i]
|
||||
if tempData.Level >= selectLv then
|
||||
break
|
||||
end
|
||||
lastGNum = math.floor(curGemNum/tempData.UpgradeNum)
|
||||
totalMoney = totalMoney + lastGNum*tempData.UpgradeCost[2]
|
||||
local bagGemNum = BagManager.GetTotalItemNum(tempData.Id)--当前背包中数量
|
||||
local curGemNum = 0--当前可使用合成的该等级的Gem数量
|
||||
if bagGemNum > 0 then
|
||||
finalList[tempData.Id] = bagGemNum - remainNum
|
||||
curGemNum = bagGemNum + lastGNum--当前一共拥有命石数量(包括已经合成的数量)
|
||||
end
|
||||
local haveGoldNum= BagManager.GetTotalItemNum(tempData.UpgradeCost[1])
|
||||
if totalMoney>haveGoldNum then
|
||||
return false
|
||||
if curGemNum < tempData.UpgradeNum then--如果出现断层,需要清空数据继续遍历,
|
||||
finalList = {}
|
||||
totalMoney = 0
|
||||
lastGNum = 0
|
||||
else
|
||||
local needNum = this.DoCircle2(tempData.Type,tempData.Level,selectLv)
|
||||
local remainNum = curGemNum%tempData.UpgradeNum
|
||||
if curGemNum > needNum then
|
||||
remainNum = curGemNum - needNum
|
||||
curGemNum = needNum
|
||||
end
|
||||
lastGNum = math.floor(curGemNum/tempData.UpgradeNum)
|
||||
totalMoney = totalMoney + lastGNum*tempData.UpgradeCost[2]
|
||||
if bagGemNum > 0 then
|
||||
finalList[tempData.Id] = bagGemNum - remainNum
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -235,7 +243,7 @@ function this.FastConpound(id)
|
|||
tempList[key] = value
|
||||
end
|
||||
end
|
||||
return true,lastGNum==1,tempList,totalMoney
|
||||
return lastGNum==1,tempList,totalMoney,BagManager.GetTotalItemNum(14) >= totalMoney
|
||||
end
|
||||
|
||||
function this.DoCircle2(type,curLevel,targetLevel)
|
||||
|
|
|
@ -102,7 +102,7 @@ function GemCompound:SetCost(bool)
|
|||
list[args[1]] = 1
|
||||
money = gemConfig[args[1]].UpgradeCost[2]
|
||||
else--快速合成
|
||||
bool1,bool2,list,money = GemManager.FastConpound(args[1])
|
||||
bool2,list,money,bool1 = GemManager.FastConpound(args[1])
|
||||
end
|
||||
if not bool2 then
|
||||
list[args[1]] = 0
|
||||
|
@ -118,7 +118,7 @@ function GemCompound:SetCost(bool)
|
|||
return a.id < b.id
|
||||
end)
|
||||
|
||||
local color = bool1 and "#FF8909" or "red"
|
||||
local color = bool1 and "#FBF7F1" or "red"
|
||||
self.money.text = string.format("<color=%s>%s</color>",color,money)
|
||||
|
||||
self.ScrollView:SetData(list2, function(index, go)
|
||||
|
|
|
@ -6273,7 +6273,9 @@ function this.LifeStoneUpRequest(_type,_gridId,_gridIndex,_curGemId,_selectNum,f
|
|||
--获取新战力
|
||||
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
|
||||
local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower})
|
||||
if oldWarPower ~= tempPower then
|
||||
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower})
|
||||
end
|
||||
if msg.drop then
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1)
|
||||
end
|
||||
|
@ -6313,7 +6315,9 @@ function this.LifeGridChangeRequest(_type,_gridId,_gridIndex,_curGemId,func)
|
|||
--获取新战力
|
||||
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)
|
||||
local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower})
|
||||
if oldWarPower ~= tempPower then
|
||||
UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower})
|
||||
end
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
|
|
|
@ -45,7 +45,7 @@ function this:Refresh()
|
|||
self.money.text = self.args[2]
|
||||
local list = {}
|
||||
for key, value in pairs(self.args[1]) do
|
||||
LogGreen("id:"..tostring(key).." num:"..tostring(value))
|
||||
-- LogGreen("id:"..tostring(key).." num:"..tostring(value))
|
||||
local data = {}
|
||||
data.id = key
|
||||
data.num = value
|
||||
|
|
Loading…
Reference in New Issue