diff --git a/Assets/Art/HHWK/texture/loading/game177_loading1.png b/Assets/Art/HHWK/texture/loading/game177_loading1.png
index 31f78b67c..14a9d541c 100644
Binary files a/Assets/Art/HHWK/texture/loading/game177_loading1.png and b/Assets/Art/HHWK/texture/loading/game177_loading1.png differ
diff --git a/Assets/Art/HHWK/texture/loading/game177_loading1.png.meta b/Assets/Art/HHWK/texture/loading/game177_loading1.png.meta
index 50ac2e460..414543b48 100644
--- a/Assets/Art/HHWK/texture/loading/game177_loading1.png.meta
+++ b/Assets/Art/HHWK/texture/loading/game177_loading1.png.meta
@@ -3,7 +3,7 @@ guid: bdd026d36a2878c4db9e3d2b6d872eec
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
- serializedVersion: 11
+ serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
+ flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -54,10 +57,15 @@ TextureImporter:
textureType: 8
textureShape: 1
singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
+ ignorePngGamma: 0
applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
@@ -69,6 +77,59 @@ TextureImporter:
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 2
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 2
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 2
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 2
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
@@ -84,9 +145,9 @@ TextureImporter:
edges: []
weights: []
secondaryTextures: []
- spritePackingTag:
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
userData:
assetBundleName: assets_game_download_games_game177_texture_loading
assetBundleVariant:
diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity
index af20e2af5..20141f44d 100644
--- a/Assets/MyGame/Scenes/UIScene.unity
+++ b/Assets/MyGame/Scenes/UIScene.unity
@@ -2120,6 +2120,309 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 18.704224, y: 70.2}
m_EdgeRadius: 0
+--- !u!1001 &358393310
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 2020054633}
+ m_Modifications:
+ - target: {fileID: 1447821011612761746, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_Name
+ value: "\u63D0\u793A 1"
+ objectReference: {fileID: 0}
+ - target: {fileID: 1932881182925195897, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2521554391852547163, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2521554391852547163, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2521554391852547163, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 455.27252
+ objectReference: {fileID: 0}
+ - target: {fileID: 2521554391852547163, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -50
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 707
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 436
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -1.5000343
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -10
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3960442344582372387, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6169819287370780739, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6169819287370780739, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6169819287370780739, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6169819287370780739, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7637442344215332289, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 8657674084514639717, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 358393319}
+ - targetCorrespondingSourceObject: {fileID: 7558516381944211509, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1251851982}
+ m_SourcePrefab: {fileID: 100100000, guid: 9942aa9d55939d442807c418bec2eb3a, type: 3}
+--- !u!224 &358393311 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 358393310}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &358393312 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7558516381944211509, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 358393310}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &358393313 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 5664831199731798939, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 358393310}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 358393312}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &358393314 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8657674084514639717, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 358393310}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &358393315 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 7997201897000990162, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 358393310}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 358393314}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &358393316 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 6881909071172154101, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 358393310}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &358393317 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 5077158635959651760, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 358393310}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &358393318 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 1407117275869039512, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 358393310}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &358393319
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 358393314}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ 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: 358393315}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &367977124
GameObject:
m_ObjectHideFlags: 0
@@ -5699,6 +6002,7 @@ RectTransform:
- {fileID: 3182697403238626235}
- {fileID: 1137879511}
- {fileID: 52236778}
+ - {fileID: 2020054632}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -6785,6 +7089,50 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1248128280}
m_CullTransparentMesh: 1
+--- !u!114 &1251851982
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 358393312}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ 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: 358393313}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1 &1312826143
GameObject:
m_ObjectHideFlags: 0
@@ -9851,6 +10199,180 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2016282716}
m_CullTransparentMesh: 1
+--- !u!1001 &2020054631
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 1096182889}
+ m_Modifications:
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5297965370328433198, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_Name
+ value: BackPack
+ objectReference: {fileID: 0}
+ - target: {fileID: 5979716680938546605, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5979716680938546605, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6705112074661646421, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: btn_Add
+ value:
+ objectReference: {fileID: 1251851982}
+ - target: {fileID: 6705112074661646421, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: btn_QueRen
+ value:
+ objectReference: {fileID: 358393317}
+ - target: {fileID: 6705112074661646421, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: btn_Subtract
+ value:
+ objectReference: {fileID: 358393319}
+ - target: {fileID: 6705112074661646421, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: slider_UseNum
+ value:
+ objectReference: {fileID: 358393316}
+ - target: {fileID: 6705112074661646421, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: tMPText_ShiyongLabel
+ value:
+ objectReference: {fileID: 358393318}
+ - target: {fileID: 6735192382069086011, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: 8705393558480048997, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 358393311}
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: c48b9e15c1940764a9da95551887a147, type: 3}
+--- !u!224 &2020054632 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 637063591879029105, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ m_PrefabInstance: {fileID: 2020054631}
+ m_PrefabAsset: {fileID: 0}
+--- !u!224 &2020054633 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 8705393558480048997, guid: c48b9e15c1940764a9da95551887a147,
+ type: 3}
+ m_PrefabInstance: {fileID: 2020054631}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &2053128244
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/MyGame/Scripts/Net/APIRequest/Params/HallRequest.cs b/Assets/MyGame/Scripts/Net/APIRequest/Params/HallRequest.cs
index e405de611..c3892cf27 100644
--- a/Assets/MyGame/Scripts/Net/APIRequest/Params/HallRequest.cs
+++ b/Assets/MyGame/Scripts/Net/APIRequest/Params/HallRequest.cs
@@ -149,12 +149,21 @@ namespace Assets.MyGame.Scripts.Net.APIRequest.Params
}
///
- /// �л�ս���������
+ /// 切换战神请求参数
///
[Serializable]
public class ChangeGodWarParam : RequestParamBase
{
- public string number; // ս����
+ public string number; // 战神编号
+ }
+
+ ///
+ /// 使用VIP经验包请求参数（count=使用数量）
+ ///
+ [Serializable]
+ public class UseVipExpParam : RequestParamBase
+ {
+ public int count;
}
///
diff --git a/Assets/MyGame/Scripts/Net/APIRequestList_Hall.cs b/Assets/MyGame/Scripts/Net/APIRequestList_Hall.cs
index 0159e836b..00f152433 100644
--- a/Assets/MyGame/Scripts/Net/APIRequestList_Hall.cs
+++ b/Assets/MyGame/Scripts/Net/APIRequestList_Hall.cs
@@ -334,12 +334,13 @@ namespace Assets.MyGame.Scripts.Net
}
///
- /// 使用VIP经验包（GET /api/Hall/UseVipExp）
+ /// 使用VIP经验包（GET /api/Hall/UseVipExp?count=）
/// 返回：string
///
- public static void UseVipExp(Action callback = null)
+ /// 使用数量（默认1）
+ public static void UseVipExp(int count = 1, Action callback = null)
{
- APIManager.Response(APIType.Hall_UseVipExp, callback);
+ APIManager.Response(APIType.Hall_UseVipExp, new UseVipExpParam { count = count }, callback);
}
#endregion
diff --git a/Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadIngTemp/UIGame177LoadingView.prefab b/Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadIngTemp/UIGame177LoadingView.prefab
index 0fe41f286..66732f768 100644
--- a/Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadIngTemp/UIGame177LoadingView.prefab
+++ b/Assets/MyGame/aa/UI/DefaultPanel/LoadPanel/LoadIngTemp/UIGame177LoadingView.prefab
@@ -365,14 +365,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0.97765356, b: 0, a: 1}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 21aba0fad42bb514ca3c4736d613404b, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 629d7e386ead8ea49b8e34c4986a048a, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -707,6 +707,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 5494969937974881520}
- {fileID: 6742571252770769959}
m_Father: {fileID: 6114408877341087527}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -743,7 +744,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: b662d68aa72889a4ab14d123bf2528bb, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 630496439fe6bf243ba97bef46ec8c24, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -818,7 +819,82 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: b6500b217c54ea748a764274526b39bc, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 1000e68ff521dfe43ad5674fe2c43713, type: 3}
+ m_Type: 1
+ 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 &6301597443623545791
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5494969937974881520}
+ - component: {fileID: 5611486403026417207}
+ - component: {fileID: 5637539301767341051}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5494969937974881520
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6301597443623545791}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 8031883748199427146}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: -0.4907, y: -262.7217}
+ m_SizeDelta: {x: -79.6833, y: -700.8773}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5611486403026417207
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6301597443623545791}
+ m_CullTransparentMesh: 1
+--- !u!114 &5637539301767341051
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6301597443623545791}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 3b4dcbfbc85186341ac13549f764e8df, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab
index 0f7de4fb6..0b04e8d14 100644
--- a/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab
+++ b/Assets/MyGame/aa/UI/Game/FLZY/GameMainPanel_FLZY.prefab
@@ -6416,6 +6416,16 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 8080891624328096898}
m_Modifications:
+ - target: {fileID: -3972632372573893170, guid: 6c8512965de208f498306fbdfeb8eb5b,
+ type: 3}
+ propertyPath: slider
+ value:
+ objectReference: {fileID: 4942476784912624385}
+ - target: {fileID: 1390265440039436894, guid: 6c8512965de208f498306fbdfeb8eb5b,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 3429558903206714841, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
propertyPath: m_AnchorMax.y
@@ -6426,10 +6436,15 @@ PrefabInstance:
propertyPath: m_Name
value: UIGame177LoadingView
objectReference: {fileID: 0}
- - target: {fileID: 3783151213167614958, guid: 6c8512965de208f498306fbdfeb8eb5b,
+ - target: {fileID: 5494969937974881520, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
- propertyPath: m_IsActive
- value: 1
+ propertyPath: m_AnchoredPosition.x
+ value: -0.49072266
+ objectReference: {fileID: 0}
+ - target: {fileID: 5494969937974881520, guid: 6c8512965de208f498306fbdfeb8eb5b,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -262.72168
objectReference: {fileID: 0}
- target: {fileID: 6114408877341087527, guid: 6c8512965de208f498306fbdfeb8eb5b,
type: 3}
@@ -6531,17 +6546,23 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -0
objectReference: {fileID: 0}
- - target: {fileID: 8405686698745501670, guid: 6c8512965de208f498306fbdfeb8eb5b,
- type: 3}
- propertyPath: m_Sprite
- value:
- objectReference: {fileID: 21300000, guid: 630496439fe6bf243ba97bef46ec8c24,
- type: 3}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6c8512965de208f498306fbdfeb8eb5b, type: 3}
+--- !u!114 &4942476784912624385 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 6565779888811675298, guid: 6c8512965de208f498306fbdfeb8eb5b,
+ type: 3}
+ m_PrefabInstance: {fileID: 2272455748234700195}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!224 &5427923924039758468 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 6114408877341087527, guid: 6c8512965de208f498306fbdfeb8eb5b,
diff --git a/Assets/MyGame/aa/UI/Home/Sub/BackPack.prefab b/Assets/MyGame/aa/UI/Home/Sub/BackPack.prefab
index 3e4a163a5..82c757214 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/BackPack.prefab
+++ b/Assets/MyGame/aa/UI/Home/Sub/BackPack.prefab
@@ -1199,6 +1199,7 @@ RectTransform:
- {fileID: 5516866319861866829}
- {fileID: 5083817559448362417}
- {fileID: 3714754719059391846}
+ - {fileID: 933672930692470415}
m_Father: {fileID: 637063591879029105}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -2654,6 +2655,7 @@ MonoBehaviour:
tMP_Description: {fileID: 5258184139177171062}
img_Prop: {fileID: 4306247461914798709}
propID:
+ propName:
propType: 0
scrollRect: {fileID: 913925080212605732}
btn_Use: {fileID: 4535463459306943413}
@@ -2663,6 +2665,12 @@ MonoBehaviour:
DaLaBaPanel: {fileID: 8768692979442461176}
tMPText_DaLaBaLabel: {fileID: 5734165177119151511}
btn_FaSong: {fileID: 2510574370304522061}
+ useObj: {fileID: 3132388542001636134}
+ slider_UseNum: {fileID: 6984723021999484737}
+ tMPText_ShiyongLabel: {fileID: 3236081486423250476}
+ btn_Add: {fileID: 4337249290452243180}
+ btn_Subtract: {fileID: 6361794136797466608}
+ btn_QueRen: {fileID: 8726423169263079428}
--- !u!222 &-6269927553038755508
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -5839,3 +5847,361 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 73170777807184667}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &4571095632995196340
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 8705393558480048997}
+ m_Modifications:
+ - target: {fileID: 1447821011612761746, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_Name
+ value: "\u63D0\u793A 1"
+ objectReference: {fileID: 0}
+ - target: {fileID: 1447821011612761746, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1932881182925195897, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2521554391852547163, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2521554391852547163, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2521554391852547163, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 455.27252
+ objectReference: {fileID: 0}
+ - target: {fileID: 2521554391852547163, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -50
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 707
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 436
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -1.5000343
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -10
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3960442344582372387, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6169819287370780739, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6169819287370780739, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6169819287370780739, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 303.515
+ objectReference: {fileID: 0}
+ - target: {fileID: 6169819287370780739, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -50
+ objectReference: {fileID: 0}
+ - target: {fileID: 7637442344215332289, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 8657674084514639717, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 6361794136797466608}
+ - targetCorrespondingSourceObject: {fileID: 7558516381944211509, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 4337249290452243180}
+ m_SourcePrefab: {fileID: 100100000, guid: 9942aa9d55939d442807c418bec2eb3a, type: 3}
+--- !u!224 &933672930692470415 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 3718523959878486843, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 4571095632995196340}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &3132388542001636134 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 1447821011612761746, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 4571095632995196340}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &3236081486423250476 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 1407117275869039512, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 4571095632995196340}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &5136909493637821137 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 8657674084514639717, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 4571095632995196340}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &6361794136797466608
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5136909493637821137}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ 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: 5878340470900680806}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &5878340470900680806 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 7997201897000990162, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 4571095632995196340}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5136909493637821137}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!1 &6308124536848381313 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7558516381944211509, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 4571095632995196340}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &4337249290452243180
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6308124536848381313}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ 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: 8210711605710999087}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!114 &6984723021999484737 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 6881909071172154101, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 4571095632995196340}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &8210711605710999087 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 5664831199731798939, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 4571095632995196340}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6308124536848381313}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &8726423169263079428 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 5077158635959651760, guid: 9942aa9d55939d442807c418bec2eb3a,
+ type: 3}
+ m_PrefabInstance: {fileID: 4571095632995196340}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_BackPackPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_BackPackPanel.cs
index 6d90eab13..4a506a12e 100644
--- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_BackPackPanel.cs
+++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_BackPackPanel.cs
@@ -23,6 +23,7 @@ public class UIHome_BY_BackPackPanel : SubUIBase
public TextMeshProUGUI tMP_Description;
public Image img_Prop;
public string propID;
+ public string propName; // 当前选中道具名称（数量选择面板用）
public PropEnum propType;
public ScrollRect scrollRect;
@@ -38,12 +39,18 @@ public class UIHome_BY_BackPackPanel : SubUIBase
public TMP_InputField tMPText_DaLaBaLabel;
public Button btn_FaSong;
[Header("使用提示（带数量）")]
+ public GameObject useObj;
public Slider slider_UseNum;
public TextMeshProUGUI tMPText_ShiyongLabel;//确认使用道具 propname*数量
public Button btn_Add;
public Button btn_Subtract;
public Button btn_QueRen;
+ /// 当前选中道具的拥有数量（用于数量选择面板上限）
+ private int _curPropOwnedCount;
+ /// 当前选中数量选择面板对应道具的回调（确认使用时调用）
+ private System.Action _curUseCountAction;
+
// 刷新时保存的状态
//private Vector2 savedScrollPos;
private string savedPropID;
@@ -66,6 +73,78 @@ public class UIHome_BY_BackPackPanel : SubUIBase
DaLaBaPanel.SetActive(false);
if (btn_FaSong != null)
btn_FaSong.onClick.AddListener(OnClickFaSong);
+
+ // 数量选择面板（默认隐藏）
+ if (useObj != null) useObj.SetActive(false);
+
+ if (slider_UseNum != null)
+ slider_UseNum.onValueChanged.AddListener(v => UpdateUseNumLabel());
+
+ if (btn_Add != null)
+ btn_Add.onClick.AddListener(() =>
+ {
+ if (slider_UseNum != null)
+ slider_UseNum.value = Mathf.Min((int)slider_UseNum.value + 1, (int)slider_UseNum.maxValue);
+ });
+
+ if (btn_Subtract != null)
+ btn_Subtract.onClick.AddListener(() =>
+ {
+ if (slider_UseNum != null)
+ slider_UseNum.value = Mathf.Max((int)slider_UseNum.value - 1, (int)slider_UseNum.minValue);
+ });
+
+ if (btn_QueRen != null)
+ btn_QueRen.onClick.AddListener(OnClickConfirmUseNum);
+ }
+
+ /// 刷新数量选择标签
+ private void UpdateUseNumLabel()
+ {
+ if (tMPText_ShiyongLabel == null) return;
+ int n = slider_UseNum != null ? Mathf.RoundToInt(slider_UseNum.value) : 1;
+ tMPText_ShiyongLabel.text = $"确认使用道具 {propName} * {n}";
+ }
+
+ /// 确认使用按钮：执行当前数量回调
+ private void OnClickConfirmUseNum()
+ {
+ int n = slider_UseNum != null ? Mathf.RoundToInt(slider_UseNum.value) : 1;
+ if (n <= 0)
+ {
+ UIManager.Instance.ShowBoardError("数量必须大于0");
+ return;
+ }
+ var cb = _curUseCountAction;
+ HideUseNumPanel();
+ cb?.Invoke(n);
+ }
+
+ /// 显示数量选择面板
+ /// 当前拥有数量（滑块上限）
+ /// 确认使用回调（参数=使用数量）
+ private void ShowUseNumPanel(int ownedCount, System.Action onConfirm)
+ {
+ _curPropOwnedCount = ownedCount;
+ _curUseCountAction = onConfirm;
+
+ if (useObj != null) useObj.SetActive(true);
+
+ if (slider_UseNum != null)
+ {
+ slider_UseNum.minValue = 1;
+ slider_UseNum.maxValue = Mathf.Max(1, ownedCount);
+ slider_UseNum.value = 1;
+ slider_UseNum.wholeNumbers = true;
+ }
+ UpdateUseNumLabel();
+ }
+
+ /// 隐藏数量选择面板
+ private void HideUseNumPanel()
+ {
+ if (useObj != null) useObj.SetActive(false);
+ _curUseCountAction = null;
}
private void OnClickFaSong()
@@ -196,6 +275,7 @@ public class UIHome_BY_BackPackPanel : SubUIBase
tMP_Name.text = product.name;
tMP_Description.text = product.desc;
propID = product.number;
+ propName = product.name;
propType = (PropEnum)product.type;
WebTool.DownImage(APIManager.baseURL + product.imageUrl, (texture) =>
@@ -227,12 +307,12 @@ public class UIHome_BY_BackPackPanel : SubUIBase
case PropEnum.技能: break;
case PropEnum.召唤卡: break;
case PropEnum.VIP经验:
- UIManager.Instance.ShowTiShi($"确定要使用VIP经验包吗？", () =>
+ // 数量选择面板：滑块上限=当前拥有数量
+ ShowUseNumPanel(product.count, n =>
{
- APIRequestList.UseVipExp((result) =>
+ APIRequestList.UseVipExp(n, (result) =>
{
UIManager.Instance.ShowBoardError("使用成功");
- // 刷新用户数据
APIRequestList.GetUser(GameManager.Instance.user.id, (user) =>
{
GameManager.Instance.UpdataUserData(user);
diff --git a/Assets/UIResources/Login/条.png b/Assets/UIResources/Login/条.png
new file mode 100644
index 000000000..772d0802c
Binary files /dev/null and b/Assets/UIResources/Login/条.png differ
diff --git a/Assets/UIResources/Login/条.png.meta b/Assets/UIResources/Login/条.png.meta
new file mode 100644
index 000000000..940aed48d
--- /dev/null
+++ b/Assets/UIResources/Login/条.png.meta
@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: 629d7e386ead8ea49b8e34c4986a048a
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 13
+ 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
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 0
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 14, y: 0, z: 15, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 1537655665
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UIResources/Login/进度条.png b/Assets/UIResources/Login/进度条.png
new file mode 100644
index 000000000..3e4cbcb99
Binary files /dev/null and b/Assets/UIResources/Login/进度条.png differ
diff --git a/Assets/UIResources/Login/进度条.png.meta b/Assets/UIResources/Login/进度条.png.meta
new file mode 100644
index 000000000..a25b60a2e
--- /dev/null
+++ b/Assets/UIResources/Login/进度条.png.meta
@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: 3b4dcbfbc85186341ac13549f764e8df
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 13
+ 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
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 0
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 30, y: 0, z: 33, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 1537655665
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/UIResources/Login/进度条地.png b/Assets/UIResources/Login/进度条地.png
new file mode 100644
index 000000000..008fff8ed
Binary files /dev/null and b/Assets/UIResources/Login/进度条地.png differ
diff --git a/Assets/UIResources/Login/进度条地.png.meta b/Assets/UIResources/Login/进度条地.png.meta
new file mode 100644
index 000000000..1afde0a0e
--- /dev/null
+++ b/Assets/UIResources/Login/进度条地.png.meta
@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: 1000e68ff521dfe43ad5674fe2c43713
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 13
+ 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
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 0
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 15, y: 0, z: 14, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 1537655665
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant: