Commit 6a21e725 authored by LiLiuZhou's avatar LiLiuZhou

1

parent 9ad06b2d
fileFormatVersion: 2
guid: a5a7cfb15d2b93d4bbc20aa9fd5c164b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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: -1
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
applyGammaDecoding: 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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: d66a2209c8d1e3a48b1e02e3d2da7a66
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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: -1
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
applyGammaDecoding: 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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 42d07fb8288b0234182d3bf706850025
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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: -1
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
applyGammaDecoding: 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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 4e1c4e8a9c554c74d87fb95200b3614b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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: -1
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
applyGammaDecoding: 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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 4820902d313289e40a7a4864ef535149
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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: -1
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
applyGammaDecoding: 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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5fee4c59206e8d541bed5655d9b96768
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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: -1
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
applyGammaDecoding: 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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 075d9bc0a1c133344b0630e431c4ccd9
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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: -1
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
applyGammaDecoding: 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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 549bbc9ae0ff72f4c83f5720df47d087
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
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: -1
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
applyGammaDecoding: 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
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
...@@ -37,6 +37,8 @@ public class UIMgr : BaseMgr<UIMgr> ...@@ -37,6 +37,8 @@ public class UIMgr : BaseMgr<UIMgr>
public Transform upper_top; public Transform upper_top;
public Transform system; public Transform system;
public Canvas botcanvas;
public const string PANEL_PATH = "UI/Panel/"; public const string PANEL_PATH = "UI/Panel/";
...@@ -161,10 +163,13 @@ public class UIMgr : BaseMgr<UIMgr> ...@@ -161,10 +163,13 @@ public class UIMgr : BaseMgr<UIMgr>
public void RegisterPanel<T>(T panel) where T : BasePanel public void RegisterPanel<T>(T panel) where T : BasePanel
{ {
if (!botcanvas)
botcanvas = panel.GetComponentInParent<Canvas>();
CheckInit(); CheckInit();
paneldic.Add(typeof(T).ToString(), panel); paneldic.Add(typeof(T).ToString(), panel);
panel.OnInit(); panel.OnInit();
} }
public void HidePanel<T>(string name = null) where T:BasePanel public void HidePanel<T>(string name = null) where T:BasePanel
{ {
CheckInit(); CheckInit();
...@@ -179,7 +184,7 @@ public class UIMgr : BaseMgr<UIMgr> ...@@ -179,7 +184,7 @@ public class UIMgr : BaseMgr<UIMgr>
} }
} }
public T GetPanel<T>() where T:BasePanel public T GetPanel<T>(bool ShowError = true) where T:BasePanel
{ {
CheckInit(); CheckInit();
...@@ -189,7 +194,12 @@ public class UIMgr : BaseMgr<UIMgr> ...@@ -189,7 +194,12 @@ public class UIMgr : BaseMgr<UIMgr>
{ {
return paneldic[name] as T; return paneldic[name] as T;
} }
Debug.LogError("没有找到" + name + "面板");
if (ShowError)
{
Debug.LogError("没有找到" + name + "面板");
}
return null; return null;
} }
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!687078895 &4343727234628468602
SpriteAtlas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: CashOutAtlas
m_EditorData:
serializedVersion: 2
textureSettings:
serializedVersion: 2
anisoLevel: 1
compressionQuality: 50
maxTextureSize: 2048
textureCompression: 0
filterMode: 1
generateMipMaps: 0
readable: 0
crunchedCompression: 0
sRGB: 1
platformSettings: []
packingSettings:
serializedVersion: 2
padding: 8
blockOffset: 1
allowAlphaSplitting: 0
enableRotation: 0
enableTightPacking: 0
variantMultiplier: 1
packables:
- {fileID: 21300000, guid: a5a7cfb15d2b93d4bbc20aa9fd5c164b, type: 3}
- {fileID: 21300000, guid: d66a2209c8d1e3a48b1e02e3d2da7a66, type: 3}
- {fileID: 21300000, guid: 42d07fb8288b0234182d3bf706850025, type: 3}
- {fileID: 21300000, guid: 4e1c4e8a9c554c74d87fb95200b3614b, type: 3}
- {fileID: 21300000, guid: 4820902d313289e40a7a4864ef535149, type: 3}
- {fileID: 21300000, guid: 5fee4c59206e8d541bed5655d9b96768, type: 3}
bindAsDefault: 1
m_MasterAtlas: {fileID: 0}
m_PackedSprites:
- {fileID: 21300000, guid: a5a7cfb15d2b93d4bbc20aa9fd5c164b, type: 3}
- {fileID: 21300000, guid: 42d07fb8288b0234182d3bf706850025, type: 3}
- {fileID: 21300000, guid: d66a2209c8d1e3a48b1e02e3d2da7a66, type: 3}
- {fileID: 21300000, guid: 5fee4c59206e8d541bed5655d9b96768, type: 3}
- {fileID: 21300000, guid: 4e1c4e8a9c554c74d87fb95200b3614b, type: 3}
- {fileID: 21300000, guid: 4820902d313289e40a7a4864ef535149, type: 3}
m_PackedSpriteNamesToIndex:
- 1
- 3
- 2
- 6
- 4
- 5
m_Tag: CashOutAtlas
m_IsVariant: 0
fileFormatVersion: 2
guid: 5de0bfdd042ea5d4ebbeb6d1d7e8294c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 4343727234628468602
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &4072837838839315476 --- !u!1 &1842962354468054649
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -8,10 +8,10 @@ GameObject: ...@@ -8,10 +8,10 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 2175797980302585412} - component: {fileID: 4550844184097436713}
- component: {fileID: 2585618336016504729} - component: {fileID: 213870670259752436}
- component: {fileID: 8810679527214072795} - component: {fileID: 6580874277717006774}
- component: {fileID: 8474092540634430385} - component: {fileID: 6092282140735070684}
m_Layer: 5 m_Layer: 5
m_Name: txtMoney m_Name: txtMoney
m_TagString: Untagged m_TagString: Untagged
...@@ -19,18 +19,18 @@ GameObject: ...@@ -19,18 +19,18 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!224 &2175797980302585412 --- !u!224 &4550844184097436713
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4072837838839315476} m_GameObject: {fileID: 1842962354468054649}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: []
m_Father: {fileID: 7651116685895875115} m_Father: {fileID: 5420115163167989830}
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.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
...@@ -38,28 +38,28 @@ RectTransform: ...@@ -38,28 +38,28 @@ RectTransform:
m_AnchoredPosition: {x: -2.87, y: -3.7299} m_AnchoredPosition: {x: -2.87, y: -3.7299}
m_SizeDelta: {x: 154.25879, y: 82.540245} m_SizeDelta: {x: 154.25879, y: 82.540245}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2585618336016504729 --- !u!222 &213870670259752436
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4072837838839315476} m_GameObject: {fileID: 1842962354468054649}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &8810679527214072795 --- !u!114 &6580874277717006774
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4072837838839315476} m_GameObject: {fileID: 1842962354468054649}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:
...@@ -79,13 +79,13 @@ MonoBehaviour: ...@@ -79,13 +79,13 @@ MonoBehaviour:
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "0.3<size=20>\u5143</size>" m_Text: "0.3<size=20>\u5143</size>"
--- !u!114 &8474092540634430385 --- !u!114 &6092282140735070684
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4072837838839315476} m_GameObject: {fileID: 1842962354468054649}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 69dd235bcabe6594981b1d2a5b983afe, type: 3} m_Script: {fileID: 11500000, guid: 69dd235bcabe6594981b1d2a5b983afe, type: 3}
...@@ -93,7 +93,7 @@ MonoBehaviour: ...@@ -93,7 +93,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
spacing_x: 2.15 spacing_x: 2.15
spacing_y: 0 spacing_y: 0
--- !u!1 &6957026834594904793 --- !u!1 &4727221718527418548
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -101,11 +101,11 @@ GameObject: ...@@ -101,11 +101,11 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 7651116685895875115} - component: {fileID: 5420115163167989830}
- component: {fileID: 2879262063162385090} - component: {fileID: 496264057024182447}
- component: {fileID: 8207840144286696811} - component: {fileID: 5836171502769364742}
- component: {fileID: 4832833926408690955} - component: {fileID: 1141293450322162737}
- component: {fileID: 3368855558657125980} - component: {fileID: 6738980682635398826}
m_Layer: 5 m_Layer: 5
m_Name: CashOutCell m_Name: CashOutCell
m_TagString: Untagged m_TagString: Untagged
...@@ -113,19 +113,20 @@ GameObject: ...@@ -113,19 +113,20 @@ GameObject:
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!224 &7651116685895875115 --- !u!224 &5420115163167989830
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6957026834594904793} m_GameObject: {fileID: 4727221718527418548}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: 4792193443101025365} - {fileID: 7176326144936590904}
- {fileID: 2175797980302585412} - {fileID: 4550844184097436713}
- {fileID: 5610353326712917610}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -134,21 +135,21 @@ RectTransform: ...@@ -134,21 +135,21 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2879262063162385090 --- !u!222 &496264057024182447
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6957026834594904793} m_GameObject: {fileID: 4727221718527418548}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &8207840144286696811 --- !u!114 &5836171502769364742
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6957026834594904793} m_GameObject: {fileID: 4727221718527418548}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
...@@ -161,7 +162,7 @@ MonoBehaviour: ...@@ -161,7 +162,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 0} m_Sprite: {fileID: 21300000, guid: 075d9bc0a1c133344b0630e431c4ccd9, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
...@@ -171,16 +172,28 @@ MonoBehaviour: ...@@ -171,16 +172,28 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!114 &4832833926408690955 --- !u!114 &1141293450322162737
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6957026834594904793} m_GameObject: {fileID: 4727221718527418548}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Script: {fileID: 11500000, guid: 6342e26c8a8ba604b94cd52b961d4111, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6738980682635398826
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4727221718527418548}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Navigation: m_Navigation:
...@@ -189,7 +202,7 @@ MonoBehaviour: ...@@ -189,7 +202,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0} m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0} m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0} m_SelectOnRight: {fileID: 0}
m_Transition: 1 m_Transition: 0
m_Colors: m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
...@@ -210,23 +223,89 @@ MonoBehaviour: ...@@ -210,23 +223,89 @@ MonoBehaviour:
m_SelectedTrigger: Selected m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled m_DisabledTrigger: Disabled
m_Interactable: 1 m_Interactable: 1
m_TargetGraphic: {fileID: 8207840144286696811} m_TargetGraphic: {fileID: 5836171502769364742}
m_OnClick: toggleTransition: 1
graphic: {fileID: 6357700130534711868}
m_Group: {fileID: 0}
onValueChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
--- !u!114 &3368855558657125980 m_IsOn: 1
--- !u!1 &5916659702075048652
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7176326144936590904}
- component: {fileID: 6697981337684680378}
- component: {fileID: 6546810215848378601}
m_Layer: 5
m_Name: imgCondition
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7176326144936590904
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5916659702075048652}
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: 5420115163167989830}
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: 43.761, y: 33.849}
m_SizeDelta: {x: 72.47824, y: 22.300995}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6697981337684680378
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5916659702075048652}
m_CullTransparentMesh: 0
--- !u!114 &6546810215848378601
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6957026834594904793} m_GameObject: {fileID: 5916659702075048652}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6342e26c8a8ba604b94cd52b961d4111, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &8289463035282086049 m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 01d6beb947d2d9b40a83edb8e59fca2f, 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
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8285159848245925795
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -234,50 +313,50 @@ GameObject: ...@@ -234,50 +313,50 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 4792193443101025365} - component: {fileID: 5610353326712917610}
- component: {fileID: 9070855045352850647} - component: {fileID: 9188843494439684927}
- component: {fileID: 8920739316070587012} - component: {fileID: 6357700130534711868}
m_Layer: 5 m_Layer: 5
m_Name: imgCondition m_Name: CheckMark
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!224 &4792193443101025365 --- !u!224 &5610353326712917610
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8289463035282086049} m_GameObject: {fileID: 8285159848245925795}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: []
m_Father: {fileID: 7651116685895875115} m_Father: {fileID: 5420115163167989830}
m_RootOrder: 0 m_RootOrder: 2
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: 1, y: 1}
m_AnchoredPosition: {x: 43.761, y: 33.849} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 72.47824, y: 22.300995} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9070855045352850647 --- !u!222 &9188843494439684927
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8289463035282086049} m_GameObject: {fileID: 8285159848245925795}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &8920739316070587012 --- !u!114 &6357700130534711868
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8289463035282086049} m_GameObject: {fileID: 8285159848245925795}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
...@@ -290,7 +369,7 @@ MonoBehaviour: ...@@ -290,7 +369,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 01d6beb947d2d9b40a83edb8e59fca2f, type: 3} m_Sprite: {fileID: 21300000, guid: 549bbc9ae0ff72f4c83f5720df47d087, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
......
...@@ -31,7 +31,7 @@ RectTransform: ...@@ -31,7 +31,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: 3255314690868922405} m_Father: {fileID: 3255314690868922405}
m_RootOrder: 4 m_RootOrder: 3
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.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -151,7 +151,6 @@ RectTransform: ...@@ -151,7 +151,6 @@ RectTransform:
- {fileID: 8423444374002758148} - {fileID: 8423444374002758148}
- {fileID: 892842341332174668} - {fileID: 892842341332174668}
- {fileID: 3071356646051272794} - {fileID: 3071356646051272794}
- {fileID: 5086317341012947321}
- {fileID: 8152328319187387052} - {fileID: 8152328319187387052}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
...@@ -244,7 +243,7 @@ RectTransform: ...@@ -244,7 +243,7 @@ RectTransform:
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.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -61, y: 8.24} m_AnchoredPosition: {x: -61, y: 0}
m_SizeDelta: {x: 187.40146, y: 48.267555} m_SizeDelta: {x: 187.40146, y: 48.267555}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2069364416673588350 --- !u!222 &2069364416673588350
...@@ -281,7 +280,7 @@ MonoBehaviour: ...@@ -281,7 +280,7 @@ MonoBehaviour:
m_BestFit: 0 m_BestFit: 0
m_MinSize: 2 m_MinSize: 2
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 0 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
...@@ -440,81 +439,3 @@ MonoBehaviour: ...@@ -440,81 +439,3 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &8620632313148175284
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5086317341012947321}
- component: {fileID: 3974199482425150172}
- component: {fileID: 8631715096496423708}
m_Layer: 5
m_Name: txtMusicAuthor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5086317341012947321
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8620632313148175284}
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: 3255314690868922405}
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: -61, y: -18.627}
m_SizeDelta: {x: 187.40146, y: 31.522263}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3974199482425150172
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8620632313148175284}
m_CullTransparentMesh: 0
--- !u!114 &8631715096496423708
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8620632313148175284}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.73333335, g: 0.73333335, b: 0.73333335, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 19
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u554A\u554A\u554A\u554A\u554A"
...@@ -30,7 +30,7 @@ RectTransform: ...@@ -30,7 +30,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: 2236707928746009589} m_Father: {fileID: 2236707928746009589}
m_RootOrder: 2 m_RootOrder: 1
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.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -333,6 +333,7 @@ MonoBehaviour: ...@@ -333,6 +333,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 49a4733262d56be40a10384256bfb908, type: 3} m_Script: {fileID: 11500000, guid: 49a4733262d56be40a10384256bfb908, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
NowCell: {fileID: 0}
--- !u!1 &2112088965665057910 --- !u!1 &2112088965665057910
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -502,124 +503,6 @@ MonoBehaviour: ...@@ -502,124 +503,6 @@ MonoBehaviour:
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1 m_PixelsPerUnitMultiplier: 1
--- !u!1 &2730626427412984281
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4258690206439002311}
- component: {fileID: 8016611735130176942}
- component: {fileID: 4793417519987785257}
- component: {fileID: 1289286400253705401}
m_Layer: 5
m_Name: btnSetting
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4258690206439002311
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2730626427412984281}
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: 2236707928746009589}
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: 291, y: 8.1817}
m_SizeDelta: {x: 72.01625, y: 72.01625}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8016611735130176942
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2730626427412984281}
m_CullTransparentMesh: 0
--- !u!114 &4793417519987785257
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2730626427412984281}
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_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 6d539b73d22d5b744ac9c2819966318c, 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
m_PixelsPerUnitMultiplier: 1
--- !u!114 &1289286400253705401
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2730626427412984281}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 4793417519987785257}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &4127527229193684191 --- !u!1 &4127527229193684191
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1045,6 +928,7 @@ GameObject: ...@@ -1045,6 +928,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 7466836343572264252} - component: {fileID: 7466836343572264252}
- component: {fileID: 1714766705548173358} - component: {fileID: 1714766705548173358}
- component: {fileID: 131139610684112485}
m_Layer: 5 m_Layer: 5
m_Name: GridLayOut m_Name: GridLayOut
m_TagString: Untagged m_TagString: Untagged
...@@ -1095,6 +979,19 @@ MonoBehaviour: ...@@ -1095,6 +979,19 @@ MonoBehaviour:
m_Spacing: {x: 26, y: 26.55} m_Spacing: {x: 26, y: 26.55}
m_Constraint: 1 m_Constraint: 1
m_ConstraintCount: 3 m_ConstraintCount: 3
--- !u!114 &131139610684112485
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6869342945713756943}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2fafe2cfe61f6974895a912c3755e8f1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AllowSwitchOff: 0
--- !u!1 &6888633391739599176 --- !u!1 &6888633391739599176
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1291,7 +1188,7 @@ MonoBehaviour: ...@@ -1291,7 +1188,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u63D0\u73B0\u6761\u4EF6" m_Text: "\u63D0\u73B0\u89C4\u5219"
--- !u!114 &4491902454114031239 --- !u!114 &4491902454114031239
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1623,7 +1520,6 @@ RectTransform: ...@@ -1623,7 +1520,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 852042965077096208} - {fileID: 852042965077096208}
- {fileID: 4258690206439002311}
- {fileID: 4739593897305157628} - {fileID: 4739593897305157628}
m_Father: {fileID: 6064660394552144844} m_Father: {fileID: 6064660394552144844}
m_RootOrder: 0 m_RootOrder: 0
...@@ -1688,7 +1584,7 @@ GameObject: ...@@ -1688,7 +1584,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &7949509679562044959 --- !u!224 &7949509679562044959
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.U2D;
using UnityEngine.UI;
public class CashOutCell : BasePanel public class CashOutCell : BasePanel
{ {
Color ChooseColor;
public WithDrawItemBean bean;
public override void OnHide(object data = null) public override void OnHide(object data = null)
{ {
throw new System.NotImplementedException(); throw new System.NotImplementedException();
...@@ -11,12 +16,56 @@ public class CashOutCell : BasePanel ...@@ -11,12 +16,56 @@ public class CashOutCell : BasePanel
public override void OnInit(object data = null) public override void OnInit(object data = null)
{ {
throw new System.NotImplementedException(); WithDrawItemBean bean = data as WithDrawItemBean;
this.bean = bean;
ChooseColor = new Color(44f / 255, 218f / 255, 162f / 255);
GetComponent<Toggle>().group = GetComponentInParent<ToggleGroup>();
GetComponent<Toggle>().onValueChanged.AddListener(value =>
{
if (value)
{
GetControl<Text>("txtMoney").color = ChooseColor;
UIMgr.Getinstance().GetPanel<CashOutPanel>().UpdateNowCell(this);
}
else
{
GetControl<Text>("txtMoney").color = Color.black;
}
});
int ConditionID = 1;
//根据描述判断需要加载哪个右上角标签
switch (bean.desc)
{
case "合成椰子":
ConditionID = 1;
break;
case "连续登录":
ConditionID = 2;
break;
case "合成西瓜":
ConditionID = 3;
break;
case "大额提现":
ConditionID = 4;
break;
case "合成歌曲":
ConditionID = 5;
break;
case "新人专享":
ConditionID = 6;
break;
}
GetControl<Image>("imgCondition").sprite = ResMgr.Getinstance().Load<SpriteAtlas>("Atlas/CashOutAtlas").GetSprite(ConditionID.ToString());
GetControl<Text>("txtMoney").text = bean.cashStr + bean.unit;
} }
public override void OnRefresh(object data = null) public override void OnRefresh(object data = null)
{ {
throw new System.NotImplementedException();
} }
} }
...@@ -102,7 +102,7 @@ public class MusicCell : BasePanel ...@@ -102,7 +102,7 @@ public class MusicCell : BasePanel
{ {
yield return www.SendWebRequest(); yield return www.SendWebRequest();
if (www.isNetworkError) if (www.isNetworkError || www.isHttpError)
{ {
Debug.Log(www.error); Debug.Log(www.error);
} }
......
...@@ -43,22 +43,7 @@ public class GameController : MonoBehaviour ...@@ -43,22 +43,7 @@ public class GameController : MonoBehaviour
})); }));
} }
/// <summary>
/// 获取提现列表
/// 类型(1 合成提现,3大额提现)
/// </summary>
public void GetWithdrawList(int type)
{
Dictionary<string, object> paras = new Dictionary<string, object>();
paras.Add("type", type);
HttpTool.Instance._Get("app/v1/watermelon/list_wd", paras, new Action<WithDrawBean>((result) =>
{
}), new Action<string, string>((code, msg) =>
{
Debug.unityLogger.Log("获取提现列表 " + code + " msg " + msg);
}));
}
......
...@@ -144,15 +144,19 @@ public class Fruit : MonoBehaviour ...@@ -144,15 +144,19 @@ public class Fruit : MonoBehaviour
UpdateSidesColiderInCD(); UpdateSidesColiderInCD();
} }
//生成音符特效 并发送事件 //生成音符特效 并发送事件
private void FlyNotes(Vector2 StartPos) private void FlyNotes(Vector2 StartPos)
{ {
GameObject obj = ResMgr.Getinstance().Load<GameObject>("Prefabs/Note"); if (!UIMgr.Getinstance().GetPanel<MusicRedBagPanel>(false))
obj.transform.ResetToCanvas(E_Layer.system, UIMgr.Getinstance().canvas.InverseTransformPoint(StartPos)); {
obj.GetComponent<Image>().sprite = GameObject obj = ResMgr.Getinstance().Load<GameObject>("Prefabs/Note");
ResMgr.Getinstance().Load<SpriteAtlas>("Atlas/Notes").GetSprite("note" + UnityEngine.Random.Range(1, 4).ToString()); obj.transform.ResetToCanvas(E_Layer.system, UIMgr.Getinstance().canvas.InverseTransformPoint(StartPos));
(obj.transform as RectTransform).DoMove(0.5f, new Vector2(0, 580), trans => { Destroy(trans.gameObject); }); obj.GetComponent<Image>().sprite =
ResMgr.Getinstance().Load<SpriteAtlas>("Atlas/Notes").GetSprite("note" + UnityEngine.Random.Range(1, 4).ToString());
(obj.transform as RectTransform).DoMove(0.5f, new Vector2(0, 580), trans => { Destroy(trans.gameObject); });
}
//发送事件 //发送事件
EventCenter.Getinstance().EventTrigger("FlyNote"); EventCenter.Getinstance().EventTrigger("FlyNote");
} }
......
...@@ -28,7 +28,7 @@ public class HomeInfoControl : MonoBehaviour ...@@ -28,7 +28,7 @@ public class HomeInfoControl : MonoBehaviour
EventCenter.Getinstance().EventTrigger("RegisterPanel"); EventCenter.Getinstance().EventTrigger("RegisterPanel");
GameController.GetInstance().GetWithdrawList(1); //GameController.GetInstance().GetWithdrawList(1);
GameController.GetInstance().GetReward(); GameController.GetInstance().GetReward();
......
using System.Collections; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
public class CashOutPanel : BasePanel public class CashOutPanel : BasePanel
{ {
public CashOutCell NowCell;
public override void OnHide(object data = null) public override void OnHide(object data = null)
{ {
...@@ -11,11 +14,45 @@ public class CashOutPanel : BasePanel ...@@ -11,11 +14,45 @@ public class CashOutPanel : BasePanel
public override void OnInit(object data = null) public override void OnInit(object data = null)
{ {
GetControl<Button>("btnBack").onClick.AddListener(() =>
{
UIMgr.Getinstance().HidePanel<CashOutPanel>();
});
GetControl<Text>("txtMoney").text = "当前余额:" + UIMgr.Getinstance().GetPanel<MainPanel>().GetControl<Text>("CashNumTv").text + "元";
Dictionary<string, object> paras = new Dictionary<string, object>();
paras.Add("type", 1);
HttpTool.Instance._Get<WithDrawBean>("app/v1/watermelon/list_wd", paras, result =>
{
for (int i = 0; i < result.list.Count; i++)
{
GameObject obj = ResMgr.Getinstance().Load<GameObject>("Cells/CashOutCell");
obj.transform.ResetToCanvas(GetControl<GridLayoutGroup>("GridLayOut").transform);
obj.GetComponent<CashOutCell>().OnInit(result.list[i]);
if(i == 0)
{
NowCell = obj.GetComponent<CashOutCell>();
}
}
NowCell.GetComponent<Toggle>().isOn = true;
},
(code, msg) =>
{
Debug.unityLogger.Log("获取提现列表 " + code + " msg " + msg);
});
} }
public override void OnRefresh(object data = null) public override void OnRefresh(object data = null)
{ {
} }
public void UpdateNowCell(CashOutCell cell)
{
NowCell = cell;
GetControl<Text>("txtDescribe").text = cell.bean.tip;
}
} }
...@@ -28,6 +28,15 @@ public class MainPanel : BasePanel ...@@ -28,6 +28,15 @@ public class MainPanel : BasePanel
public override void OnInit(object data = null) public override void OnInit(object data = null)
{ {
EventCenter.Getinstance().AddUpdateListener("FlyNote", AddSongProgress); EventCenter.Getinstance().AddUpdateListener("FlyNote", AddSongProgress);
//初始化红线
GetControl<Image>("imgRedLine").rectTransform.anchoredPosition =
new Vector2(0, UIMgr.GetInstance().botcanvas.transform.InverseTransformPoint(new Vector3(0, GameController.GetInstance().RedLinePosY, 0)).y);
GetControl<Button>("btnRightIcon").onClick.AddListener(() =>
{
UIMgr.Getinstance().ShowPanel<CashOutPanel>(E_Layer.top);
});
GetHomeInfo(); GetHomeInfo();
GetNextNoteList(); GetNextNoteList();
} }
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.Networking;
using UnityEngine.UI; using UnityEngine.UI;
public class MusicRedBagPanel : BasePanel public class MusicRedBagPanel : BasePanel
...@@ -19,6 +20,7 @@ public class MusicRedBagPanel : BasePanel ...@@ -19,6 +20,7 @@ public class MusicRedBagPanel : BasePanel
UIMgr.Getinstance().ShowPanel<MoneyRedBagPanel>(E_Layer.mid); UIMgr.Getinstance().ShowPanel<MoneyRedBagPanel>(E_Layer.mid);
}); });
GetControl<Button>("btnClose").onClick.AddListener(() => GetControl<Button>("btnClose").onClick.AddListener(() =>
{ {
UIMgr.Getinstance().GetPanel<MainPanel>().GetNextNoteList(); UIMgr.Getinstance().GetPanel<MainPanel>().GetNextNoteList();
...@@ -34,6 +36,7 @@ public class MusicRedBagPanel : BasePanel ...@@ -34,6 +36,7 @@ public class MusicRedBagPanel : BasePanel
if (UIMgr.Getinstance().GetPanel<MainPanel>().GetCurrentSongId == result.list[i].song_id) if (UIMgr.Getinstance().GetPanel<MainPanel>().GetCurrentSongId == result.list[i].song_id)
{ {
GetControl<Text>("txtMusicName").text = "你合成了歌曲“" + result.list[i].song_name + "”"; GetControl<Text>("txtMusicName").text = "你合成了歌曲“" + result.list[i].song_name + "”";
MonoMgr.Getinstance().StartCoroutine(GetTexture(result.list[i].song_cover, GetControl<Image>("imgMusicPic")));
break; break;
} }
} }
...@@ -48,4 +51,25 @@ public class MusicRedBagPanel : BasePanel ...@@ -48,4 +51,25 @@ public class MusicRedBagPanel : BasePanel
{ {
} }
IEnumerator GetTexture(string URL, Image img)
{
using (UnityWebRequest uwr = UnityWebRequestTexture.GetTexture(URL))
{
yield return uwr.SendWebRequest();
if (uwr.isNetworkError || uwr.isHttpError)
{
Debug.Log(uwr.error);
}
else
{
// Get downloaded asset bundle
Texture2D texture = DownloadHandlerTexture.GetContent(uwr);
Sprite sp = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
img.sprite = sp;
}
}
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment