diff --git a/Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/g_ghhb_ming_04.png b/Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/g_ghhb_ming_04.png
new file mode 100644
index 0000000000..b0aeeeae6f
Binary files /dev/null and b/Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/g_ghhb_ming_04.png differ
diff --git a/Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/g_ghhb_ming_04.png.meta b/Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/g_ghhb_ming_04.png.meta
new file mode 100644
index 0000000000..5a59914642
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/GuildAtlas/ArtFont/g_ghhb_ming_04.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: c7aaeb068711d47479942875700add8f
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 2710a87c9a6d7d0469564ccab0cac808
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: GuildAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Atlas/GuildAtlas/g_ghhb_hongbaotukou.png b/Assets/ManagedResources/Atlas/GuildAtlas/g_ghhb_hongbaotukou.png
new file mode 100644
index 0000000000..4595681980
Binary files /dev/null and b/Assets/ManagedResources/Atlas/GuildAtlas/g_ghhb_hongbaotukou.png differ
diff --git a/Assets/ManagedResources/Atlas/GuildAtlas/g_ghhb_hongbaotukou.png.meta b/Assets/ManagedResources/Atlas/GuildAtlas/g_ghhb_hongbaotukou.png.meta
new file mode 100644
index 0000000000..778f8eed91
--- /dev/null
+++ b/Assets/ManagedResources/Atlas/GuildAtlas/g_ghhb_hongbaotukou.png.meta
@@ -0,0 +1,99 @@
+fileFormatVersion: 2
+guid: 335d82f09da45fc49b44fd446ec99dca
+TextureImporter:
+ fileIDToRecycleName: {}
+ externalObjects: {}
+ serializedVersion: 9
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: 65
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 1
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 7cab2ccbc81c6e24780aa583005a5197
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ spritePackingTag: GuildAtlas
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab
index 5d4a4beada..271d152bdf 100644
--- a/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Guild/RedPacketView/RedPacketPanel.prefab
@@ -1,5 +1,431 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &197383435
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 197383436}
+ - component: {fileID: 197383438}
+ - component: {fileID: 197383437}
+ m_Layer: 5
+ m_Name: Desc
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &197383436
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 197383435}
+ 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: 1649807415}
+ 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: 2.1, y: -98.4}
+ m_SizeDelta: {x: 266.5, y: 52.4}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &197383438
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 197383435}
+ m_CullTransparentMesh: 0
+--- !u!114 &197383437
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 197383435}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.9686275, g: 0.93725497, b: 0.77647066, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 25
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 255
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u5FC3\u9B54\u8BD5\u70BC\u901A\u8FC7200\u5C42"
+--- !u!1 &595092208
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 595092209}
+ - component: {fileID: 595092211}
+ - component: {fileID: 595092210}
+ m_Layer: 5
+ m_Name: NameImage
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &595092209
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 595092208}
+ 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: 1649807415}
+ 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: 2.1, y: -25.7}
+ m_SizeDelta: {x: 195, y: 57}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &595092211
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 595092208}
+ m_CullTransparentMesh: 0
+--- !u!114 &595092210
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 595092208}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: c7aaeb068711d47479942875700add8f, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!1 &1649807414
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1649807415}
+ - component: {fileID: 1649807417}
+ - component: {fileID: 1649807416}
+ - component: {fileID: 1649807418}
+ m_Layer: 5
+ m_Name: Item
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1649807415
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1649807414}
+ 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:
+ - {fileID: 595092209}
+ - {fileID: 197383436}
+ - {fileID: 1882358358}
+ - {fileID: 1838434633}
+ - {fileID: 2088263246781796972}
+ m_Father: {fileID: 2959299603310150412}
+ 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: 1015, y: 265.7}
+ m_SizeDelta: {x: 301, y: 424}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1649807417
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1649807414}
+ m_CullTransparentMesh: 0
+--- !u!114 &1649807416
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1649807414}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Texture: {fileID: 2800000, guid: e30c3f5b2dd2af44d85c6e4f36330ae7, type: 3}
+ m_UVRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
+--- !u!114 &1649807418
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1649807414}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, 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_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_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1649807416}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!1 &1838434632
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1838434633}
+ - component: {fileID: 1838434635}
+ - component: {fileID: 1838434634}
+ m_Layer: 5
+ m_Name: numTxt
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1838434633
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1838434632}
+ 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: 1649807415}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0.0000019073, y: -166.1}
+ m_SizeDelta: {x: 243.85, y: 52.4}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1838434635
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1838434632}
+ m_CullTransparentMesh: 0
+--- !u!114 &1838434634
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1838434632}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.9686275, g: 0.9215687, b: 0.7411765, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 50
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u6570\u91CF110"
+--- !u!1 &1882358357
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1882358358}
+ - component: {fileID: 1882358360}
+ - component: {fileID: 1882358359}
+ m_Layer: 5
+ m_Name: Icon
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1882358358
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1882358357}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1.65, y: 1.65, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1649807415}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 80}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1882358360
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1882358357}
+ m_CullTransparentMesh: 0
+--- !u!114 &1882358359
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1882358357}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 13359dde0f9d67c4aa047816a4d00962, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &56478989171013824
GameObject:
m_ObjectHideFlags: 0
@@ -174,6 +600,80 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u4ECA\u65E5\u8FD8\u53EF\u53D1\uFF0830\uFF09"
LanguageIndex: 0
+--- !u!1 &189391611030481326
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6647916310055988456}
+ - component: {fileID: 7572906563762368177}
+ - component: {fileID: 6912382473553010373}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6647916310055988456
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 189391611030481326}
+ 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: 3354374544542951781}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -21, y: -40}
+ m_SizeDelta: {x: 70, y: 70}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7572906563762368177
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 189391611030481326}
+ m_CullTransparentMesh: 0
+--- !u!114 &6912382473553010373
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 189391611030481326}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &354331604220364581
GameObject:
m_ObjectHideFlags: 0
@@ -294,6 +794,124 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
+--- !u!1 &536596799022685883
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8633937216641047855}
+ - component: {fileID: 9183493092506596636}
+ - component: {fileID: 4680263559291788476}
+ - component: {fileID: 1713348630478564721}
+ m_Layer: 5
+ m_Name: infoPanel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &8633937216641047855
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 536596799022685883}
+ 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:
+ - {fileID: 3354374544542951781}
+ m_Father: {fileID: 2959299603310150412}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &9183493092506596636
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 536596799022685883}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, 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_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_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1713348630478564721}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!222 &4680263559291788476
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 536596799022685883}
+ m_CullTransparentMesh: 0
+--- !u!114 &1713348630478564721
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 536596799022685883}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.01886791, g: 0.01877891, b: 0.01877891, a: 0.2784314}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
--- !u!1 &605440688170322811
GameObject:
m_ObjectHideFlags: 0
@@ -400,9 +1018,9 @@ RectTransform:
m_Father: {fileID: 5999320900213361379}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 192.775, y: -31.85}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 157.55, y: 63.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &811009747699120607
@@ -833,7 +1451,7 @@ RectTransform:
- {fileID: 7115282705430582005}
- {fileID: 505735086007415890}
m_Father: {fileID: 4375683171915149675}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -848,6 +1466,41 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1468993949426860655}
m_CullTransparentMesh: 0
+--- !u!1 &1476735744140953547
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2546522484574678054}
+ m_Layer: 5
+ m_Name: grid
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2546522484574678054
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1476735744140953547}
+ 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: 2066577904990006082}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 100, y: 100}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1548470114584913436
GameObject:
m_ObjectHideFlags: 0
@@ -1023,6 +1676,124 @@ MonoBehaviour:
m_LineSpacing: 0.8
m_Text: "\u53D1\u7EA2\u5305\u699C"
LanguageIndex: 0
+--- !u!1 &1793243094852815606
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2088263246781796972}
+ - component: {fileID: 5947850931226655285}
+ - component: {fileID: 7494146053467692287}
+ - component: {fileID: 5278370697887743264}
+ m_Layer: 5
+ m_Name: btn_send
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2088263246781796972
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1793243094852815606}
+ 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:
+ - {fileID: 6371576648878199268}
+ m_Father: {fileID: 1649807415}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 2.65, y: -263.32}
+ m_SizeDelta: {x: 207.5, y: 58.41}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5947850931226655285
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1793243094852815606}
+ m_CullTransparentMesh: 0
+--- !u!114 &7494146053467692287
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1793243094852815606}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!114 &5278370697887743264
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1793243094852815606}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, 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_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_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 7494146053467692287}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
--- !u!1 &1892384971158860509
GameObject:
m_ObjectHideFlags: 0
@@ -1536,7 +2307,7 @@ RectTransform:
- {fileID: 4933192424113964483}
- {fileID: 1621226386759153115}
m_Father: {fileID: 4375683171915149675}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1788,9 +2559,9 @@ RectTransform:
m_Father: {fileID: 6950021899630084439}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 228, y: -61.3}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 122.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3315926624498439426
@@ -2136,6 +2907,221 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &3290624419024188236
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3354374544542951781}
+ - component: {fileID: 4314885030600960753}
+ - component: {fileID: 3520504031703745532}
+ - component: {fileID: 555844851426359959}
+ - component: {fileID: 7921903163929917717}
+ m_Layer: 5
+ m_Name: Content
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3354374544542951781
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3290624419024188236}
+ 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:
+ - {fileID: 4418721242652080225}
+ - {fileID: 5901554266569486079}
+ - {fileID: 3227656173773774557}
+ - {fileID: 509850414840978922}
+ - {fileID: 3149305007558434460}
+ - {fileID: 6647916310055988456}
+ m_Father: {fileID: 8633937216641047855}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -0.00000095367, y: 11.5}
+ m_SizeDelta: {x: 590.7, y: 268.3}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4314885030600960753
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3290624419024188236}
+ m_CullTransparentMesh: 0
+--- !u!114 &3520504031703745532
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3290624419024188236}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 100
+ m_Right: 0
+ m_Top: 95
+ m_Bottom: 20
+ m_ChildAlignment: 4
+ m_Spacing: 0
+ m_ChildForceExpandWidth: 0
+ m_ChildForceExpandHeight: 0
+ m_ChildControlWidth: 0
+ m_ChildControlHeight: 1
+--- !u!114 &555844851426359959
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3290624419024188236}
+ m_Enabled: 0
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
+--- !u!114 &7921903163929917717
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3290624419024188236}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 58c503111f310224a9a04ab39a004308, 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
+--- !u!1 &3358843460416863954
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4418721242652080225}
+ - component: {fileID: 5437766837394444146}
+ - component: {fileID: 7217954910122660779}
+ - component: {fileID: 7750627390231535767}
+ m_Layer: 5
+ m_Name: Title
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4418721242652080225
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3358843460416863954}
+ 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:
+ - {fileID: 7975671564180930333}
+ m_Father: {fileID: 3354374544542951781}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 295.35, y: -43}
+ m_SizeDelta: {x: 265.96, y: 54.44}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5437766837394444146
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3358843460416863954}
+ m_CullTransparentMesh: 0
+--- !u!114 &7217954910122660779
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3358843460416863954}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, 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
+--- !u!114 &7750627390231535767
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3358843460416863954}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreLayout: 1
+ m_MinWidth: -1
+ m_MinHeight: -1
+ m_PreferredWidth: -1
+ m_PreferredHeight: -1
+ m_FlexibleWidth: -1
+ m_FlexibleHeight: -1
+ m_LayoutPriority: 1
--- !u!1 &3586502366999133818
GameObject:
m_ObjectHideFlags: 0
@@ -2318,10 +3304,10 @@ RectTransform:
m_Father: {fileID: 8426497911705375594}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 80.5, y: -31.85}
- m_SizeDelta: {x: 161, y: 63.7}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 63.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6569857270438572971
CanvasRenderer:
@@ -2413,7 +3399,7 @@ RectTransform:
- {fileID: 6391740463569467481}
- {fileID: 4330425201875343372}
m_Father: {fileID: 4375683171915149675}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -2693,9 +3679,9 @@ RectTransform:
m_Father: {fileID: 8426497911705375594}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 299.066, y: -31.85}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 157.55, y: 63.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6081317573511045000
@@ -2822,7 +3808,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -424.905, y: 0.000015258789}
- m_SizeDelta: {x: 783, y: 42}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &3466327663348735508
CanvasRenderer:
@@ -2977,7 +3963,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: -78.33}
+ m_AnchoredPosition: {x: 0, y: -125}
m_SizeDelta: {x: 239.6, y: 46.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &159703597025395549
@@ -3061,7 +4047,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 278, y: 88}
- m_SizeDelta: {x: 271.55, y: 63.7}
+ m_SizeDelta: {x: 0, y: 63.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5268823493485138596
CanvasRenderer:
@@ -3108,6 +4094,86 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
+--- !u!1 &4873424926694001010
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7975671564180930333}
+ - component: {fileID: 1174391047025326029}
+ - component: {fileID: 8490432771796304623}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7975671564180930333
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4873424926694001010}
+ 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: 4418721242652080225}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: -0.000015259, y: 0.0000017881}
+ m_SizeDelta: {x: 197.07, y: 47.75}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1174391047025326029
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4873424926694001010}
+ m_CullTransparentMesh: 0
+--- !u!114 &8490432771796304623
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4873424926694001010}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.85490197, g: 0.5882353, b: 0.28627452, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 41
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 70
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u51A5\u754C\u5904\u5211\u4EBA"
+ LanguageIndex: 0
--- !u!1 &4939786346321889794
GameObject:
m_ObjectHideFlags: 0
@@ -3268,6 +4334,85 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u5F53\u524D\u6CA1\u6709\u53EF\u4EE5\u62A2\u7684\u7EA2\u5305\uFF0C\u4E0D\u6765\u4E00\u53D1\u5417\uFF1F"
LanguageIndex: 0
+--- !u!1 &5013922844126948131
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3227656173773774557}
+ - component: {fileID: 277838147618539833}
+ - component: {fileID: 5110219720131091700}
+ m_Layer: 5
+ m_Name: Text2
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3227656173773774557
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5013922844126948131}
+ 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: 3354374544542951781}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 167, y: -174.6}
+ m_SizeDelta: {x: 160, y: 33}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &277838147618539833
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5013922844126948131}
+ m_CullTransparentMesh: 0
+--- !u!114 &5110219720131091700
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5013922844126948131}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.95294124, g: 0.7254902, b: 0.21960786, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 35
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 5
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u7EA2\u5305\u91D1\u989D\uFF1A"
--- !u!1 &5054361787177451122
GameObject:
m_ObjectHideFlags: 0
@@ -3375,10 +4520,10 @@ RectTransform:
m_Father: {fileID: 5999320900213361379}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 57, y: -31.85}
- m_SizeDelta: {x: 114, y: 63.7}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 63.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4259227450090026131
CanvasRenderer:
@@ -3549,10 +4694,10 @@ RectTransform:
m_Father: {fileID: 6950021899630084439}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 114, y: -61.3}
- m_SizeDelta: {x: 228, y: 122.6}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 122.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2293772108465784614
CanvasRenderer:
@@ -3854,7 +4999,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4375683171915149675}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3931,10 +5076,10 @@ RectTransform:
m_Father: {fileID: 4351588488149147503}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 95, y: -21}
- m_SizeDelta: {x: 190, y: 42}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6469300157641790197
CanvasRenderer:
@@ -3993,6 +5138,159 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
+--- !u!1 &5826383751719905030
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2959299603310150412}
+ m_Layer: 5
+ m_Name: SendWealView
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2959299603310150412
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5826383751719905030}
+ 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:
+ - {fileID: 1649807415}
+ - {fileID: 2066577904990006082}
+ - {fileID: 8633937216641047855}
+ m_Father: {fileID: 4375683171915149675}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5967318472011524145
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2066577904990006082}
+ m_Layer: 5
+ m_Name: scrollRect
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2066577904990006082
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5967318472011524145}
+ 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:
+ - {fileID: 2546522484574678054}
+ m_Father: {fileID: 2959299603310150412}
+ 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: -0.8, y: 15.6}
+ m_SizeDelta: {x: 899.2, y: 1076.8}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5969417124901461018
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 3149305007558434460}
+ - component: {fileID: 1679990987405646426}
+ - component: {fileID: 7003658738726078912}
+ m_Layer: 5
+ m_Name: num2Txt
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &3149305007558434460
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5969417124901461018}
+ 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: 3354374544542951781}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 390.5, y: -179.3}
+ m_SizeDelta: {x: 160, y: 33}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1679990987405646426
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5969417124901461018}
+ m_CullTransparentMesh: 0
+--- !u!114 &7003658738726078912
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5969417124901461018}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.95294124, g: 0.7254902, b: 0.21960786, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 35
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: 100
--- !u!1 &6148539961604059182
GameObject:
m_ObjectHideFlags: 0
@@ -4268,6 +5566,86 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &6193826526217480459
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7543408571873051724}
+ - component: {fileID: 5765790342979978558}
+ - component: {fileID: 3357916016795616360}
+ m_Layer: 5
+ m_Name: GetInfo
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7543408571873051724
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6193826526217480459}
+ 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: 284008168457238637}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: -78}
+ m_SizeDelta: {x: 239.6, y: 46.2}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5765790342979978558
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6193826526217480459}
+ m_CullTransparentMesh: 0
+--- !u!114 &3357916016795616360
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6193826526217480459}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.97647065, g: 0.9294118, b: 0.7725491, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 23
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u68EE\u7F57\u5C0F\u6E38\u620F\u83B7\u5F97\u91D1\u8272\u7075\u517D\u65F6\u83B7\u53D6"
+ LanguageIndex: 0
--- !u!1 &6387028690942332908
GameObject:
m_ObjectHideFlags: 0
@@ -4301,8 +5679,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -0.38998, y: 0}
- m_SizeDelta: {x: 659.42, y: 100}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 912.9, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7017545218100887581
MonoBehaviour:
@@ -4327,6 +5705,85 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
+--- !u!1 &6506653311364185005
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5901554266569486079}
+ - component: {fileID: 5319084917876511561}
+ - component: {fileID: 8208740106240586294}
+ m_Layer: 5
+ m_Name: Text1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5901554266569486079
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6506653311364185005}
+ 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: 3354374544542951781}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 167, y: -111.55}
+ m_SizeDelta: {x: 160, y: 33}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5319084917876511561
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6506653311364185005}
+ m_CullTransparentMesh: 0
+--- !u!114 &8208740106240586294
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 6506653311364185005}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.95294124, g: 0.7254902, b: 0.21960786, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 35
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 5
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u7EA2\u5305\u4E2A\u6570\uFF1A"
--- !u!1 &6546715187707084075
GameObject:
m_ObjectHideFlags: 0
@@ -5044,6 +6501,85 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u6682\u65E0\u6392\u884C"
LanguageIndex: 0
+--- !u!1 &7273326085892244047
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 6371576648878199268}
+ - component: {fileID: 6577474016132739609}
+ - component: {fileID: 8195035854263923282}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &6371576648878199268
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7273326085892244047}
+ 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: 2088263246781796972}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 160, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6577474016132739609
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7273326085892244047}
+ m_CullTransparentMesh: 0
+--- !u!114 &8195035854263923282
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7273326085892244047}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.09411766, g: 0.078431375, b: 0.09411766, a: 1}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+ m_FontSize: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 3
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u53D1\u7EA2\u5305"
--- !u!1 &7323219843711791871
GameObject:
m_ObjectHideFlags: 0
@@ -5153,7 +6689,7 @@ Canvas:
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
- m_SortingOrder: 0
+ m_SortingOrder: 1
m_TargetDisplay: 0
--- !u!114 &5520522617101890405
MonoBehaviour:
@@ -5387,9 +6923,9 @@ RectTransform:
m_Father: {fileID: 8426497911705375594}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 190.64551, y: -29.645}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 59.291, y: 59.29}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1345581854343892787
@@ -5468,7 +7004,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -424.9, y: 88}
- m_SizeDelta: {x: 377.841, y: 63.7}
+ m_SizeDelta: {x: 0, y: 63.7}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &9110449981396335172
CanvasRenderer:
@@ -5848,6 +7384,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 129910163093391144}
+ - {fileID: 2959299603310150412}
- {fileID: 5273838559325964239}
- {fileID: 9190397088819678500}
- {fileID: 4756266431040088835}
@@ -5901,10 +7438,10 @@ RectTransform:
m_Father: {fileID: 4351588488149147503}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 486.5, y: -21}
- m_SizeDelta: {x: 593, y: 42}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 593, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2985974475698447598
CanvasRenderer:
@@ -6135,6 +7672,7 @@ RectTransform:
- {fileID: 8860819562913444521}
- {fileID: 3884021682045738878}
- {fileID: 6567638982056442132}
+ - {fileID: 7543408571873051724}
m_Father: {fileID: 7115282705430582005}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6356,7 +7894,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -440.925, y: -128}
- m_SizeDelta: {x: 228, y: 122.6}
+ m_SizeDelta: {x: 0, y: 122.6}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8543859208964290136
CanvasRenderer:
@@ -6478,6 +8016,85 @@ MonoBehaviour:
y: 0
width: 1
height: 1
+--- !u!1 &9060949918306908606
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 509850414840978922}
+ - component: {fileID: 5419511795425754578}
+ - component: {fileID: 232134410513463620}
+ m_Layer: 5
+ m_Name: numTxt
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &509850414840978922
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9060949918306908606}
+ 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: 3354374544542951781}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 330.1, y: -114.7}
+ m_SizeDelta: {x: 160, y: 33}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5419511795425754578
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9060949918306908606}
+ m_CullTransparentMesh: 0
+--- !u!114 &232134410513463620
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 9060949918306908606}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.95294124, g: 0.7254902, b: 0.21960786, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
+ m_FontSize: 35
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 2
+ m_MaxSize: 40
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: 100
--- !u!1 &9128408550871616796
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/Prefabs/UI/View/ChatTipView.prefab b/Assets/ManagedResources/Prefabs/UI/View/ChatTipView.prefab
index 799bd6755c..c6707486b8 100644
--- a/Assets/ManagedResources/Prefabs/UI/View/ChatTipView.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/View/ChatTipView.prefab
@@ -165,6 +165,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4076188123946629247}
+ - component: {fileID: 4658830408958243389}
m_Layer: 5
m_Name: ChatTipView
m_TagString: Untagged
@@ -186,6 +187,7 @@ RectTransform:
- {fileID: 8831934225575947771}
- {fileID: 1784279187603376772}
- {fileID: 719635812246948822}
+ - {fileID: 5374433590836753722}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -194,6 +196,35 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 480.5, y: 68.30005}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &4658830408958243389
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3406049303903296641}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ tweenSequeue:
+ - initV3: {x: 0, y: 0, z: 10}
+ initFloat: 0
+ isInit: 1
+ changeV3: {x: 0, y: 0, z: -10}
+ changeFloat: 0
+ duration: 0.2
+ delay: 0
+ curveType: 1
+ changeType: 2
+ sequeueType: 1
+ loop: 99999999
+ loopType: 1
+ targetObj: {fileID: 5374433590836753722}
+ isPlayAudio: 0
+ isHaveCloseBtn: 0
+ isPlayOnOpen: 1
--- !u!1 &4801463901571785126
GameObject:
m_ObjectHideFlags: 0
@@ -268,6 +299,143 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &5194767735720643030
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 5374433590836753722}
+ - component: {fileID: 5624456641661415722}
+ - component: {fileID: 8121788389246017803}
+ - component: {fileID: 8645292281163848114}
+ - component: {fileID: 1372551759188525827}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &5374433590836753722
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5194767735720643030}
+ 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: 4076188123946629247}
+ 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: 45.45498, y: 412}
+ m_SizeDelta: {x: 85, y: 102}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5624456641661415722
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5194767735720643030}
+ m_CullTransparentMesh: 0
+--- !u!114 &8121788389246017803
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5194767735720643030}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+ Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ m_Sprite: {fileID: 21300000, guid: 335d82f09da45fc49b44fd446ec99dca, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+--- !u!114 &8645292281163848114
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5194767735720643030}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, 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_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_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 8121788389246017803}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+ m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+ Culture=neutral, PublicKeyToken=null
+--- !u!95 &1372551759188525827
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5194767735720643030}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 69ed871880e516945ade16153b5e10c4, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &5666183199212342315
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
index 65d3673467..ef670c5a4c 100644
--- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
+++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
@@ -845,6 +845,8 @@ RedPointType = {
Guild_Skill = 1050,
Guild_DeathPos=1051,
Guild_Transcript = 1052,
+ Guid_SendPackage = 1053,
+ Guid_GetPackage = 1054,
--东海寻仙
FindFairy_OneView = 2361,--东海寻仙主界面
FindFairy_ThreeView = 2362,--东海寻仙进阶赠礼
diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua
index 0df1179aa3..b700a8fc8e 100644
--- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua
+++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua
@@ -241,6 +241,7 @@ GameEvent = {
Chat = {
OnChatDataChanged = "Chat.OnChatDataChanged",
OnMainChatChanged = "Chat.OnMainChatChanged",
+ OnRedPackageNumChanged="Chat.OnRedPackageNumChanged",
},
MissionDaily = {
OnMissionDailyChanged = "MissionDaily.OnMissionDailyChanged",
@@ -313,6 +314,7 @@ GameEvent = {
GuildRedPacket={
OnRefreshGetRedPacket="GuildRedPacket.OnRefreshGetRedPacket",
OnCloseRedPointClick="GuildRedPacket.OnCloseRedPointClick",
+ AuoGetRedPackage ="AuoGetRedPackage",
},
FiveAMRefresh = {
ServerNotifyRefresh = "FiveAMRefresh.ServerNotifyRefresh",
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua
index bc5361fdec..2c8b306fcf 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageCondition.lua
@@ -21,7 +21,7 @@ local _ConditionConfig = {
--上阵[a]个神将通过关卡
[3]=function(condition)
local v1 = condition[1]
- local list = RoleManager.Query(function(v) return v.camp == 0 end)
+ local list = RoleManager.Query(function(v) return v.camp == 0 end,true)
if BattleUtil.LengthOfTable(list)<=v1 then
return 1
end
@@ -45,7 +45,7 @@ local _ConditionConfig = {
[5]=function(condition)
local v1 = condition[1]
local v2 = condition[2]
- local list = RoleManager.Query(function(v) return v.camp == 0 and v.element==v1 end)
+ local list = RoleManager.Query(function(v) return v.camp == 0 and v.element==v1 end,true)
if BattleUtil.LengthOfTable(list)>=v2 then
return 1
end
@@ -63,7 +63,7 @@ local _ConditionConfig = {
--不上阵[a]职能神将通过关卡
[7]=function(condition)
local v1 = condition[1]
- local list = RoleManager.Query(function(v) return v.camp == 0 and v.professionId==v1 end)
+ local list = RoleManager.Query(function(v) return v.camp == 0 and v.professionId==v1 end,true)
if BattleUtil.LengthOfTable(list)==0 then
return 1
end
@@ -72,7 +72,7 @@ local _ConditionConfig = {
--不上阵[a]阵营神将通过关卡
[8]=function(condition)
local v1 = condition[1]
- local list = RoleManager.Query(function(v) return v.camp == 0 and v.element==v1 end)
+ local list = RoleManager.Query(function(v) return v.camp == 0 and v.element==v1 end,true)
if BattleUtil.LengthOfTable(list)==0 then
return 1
end
@@ -81,7 +81,7 @@ local _ConditionConfig = {
--佩戴xxxid被动通过关卡
[9]=function(condition)
local v1 = condition[1]
- local list = RoleManager.Query(function(v) return v.camp == 0 end)
+ local list = RoleManager.Query(function(v) return v.camp == 0 end,true)
if not list or #list==0 then
return 0
end
@@ -105,7 +105,7 @@ local _ConditionConfig = {
--全部上阵[a]职业神将通过关卡
[11]=function(condition)
local v1 = condition[1]
- local list = RoleManager.Query(function(v) return v.camp == 0 and v.professionId~=v1 end)
+ local list = RoleManager.Query(function(v) return v.camp == 0 and v.professionId~=v1 end,true)
if BattleUtil.LengthOfTable(list)==0 then
return 1
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua
index 35ad25e918..f85e856df1 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua
@@ -38,7 +38,6 @@ function this.OnBuffAdd(caster,target,buff)
if caster and target and buff then
if caster.camp==0 and buff.type==BuffName.Control then
local type=buff.ctrlType
- LogError("ctrltype=="..type)
if ctrlNumList[type] then
ctrlNumList[type]=ctrlNumList[type]+1
else
diff --git a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
index b3d8032c7d..7f6eff91b9 100644
--- a/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
@@ -263,6 +263,7 @@ function this.ChatDataAdapter(channel, data)
GuildRedPacketManager.isCheck = true
CheckRedPointStatus(RedPointType.Guild_RedPacket)
+ CheckRedPointStatus(RedPointType.Guid_GetPackage)
end
end
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua
index 5c8815e74f..37551c7c15 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua
@@ -258,6 +258,9 @@ function this.JoinGuildSuccess()
UIManager.OpenPanel(UIName.GuildMainCityPanel)
--
PopupTipPanel.ShowTip(Language[10377])
+ MyGuildManager.ReuqsetRedPackage(function()
+ CheckRedPointStatus(RedPointType.Guid_GetPackage)
+ end)
end
-- 设置数据类型
diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua
index 6b11d7f3b7..2a8f3ba569 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua
@@ -10,6 +10,8 @@ function this.Initialize()
this.MyGuildLogList = {}
this._MemWalkData = {}
this.MyFeteInfo={}
+ this.MyGuidRedPackage={}
+ this.PackageNum=0
end
-- 登录初始化数据
@@ -167,6 +169,32 @@ function MyGuildManager.RequestChangeLogo(logoId, func)
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.DataUpdate)
end)
end
+--请求可以领取红包数据
+function MyGuildManager.ReuqsetRedPackage(func)
+ NetManager.GetAllRedPacketResponse(function(msg)
+ local num=0
+ local SpecialConfig=ConfigManager.GetConfigData(ConfigName.SpecialConfig,115)
+ for i = 1, #msg.info do
+ local config=ConfigManager.GetConfigData(ConfigName.GuildRedPackConfig,msg.info[i].redType)
+
+ if msg.info[i].isGet==0 and (config.Num-msg.info[i].getCount)>0 then
+ if config.BaseType~=2 or PlayerManager.dailyRedPack< tonumber(SpecialConfig.Value) then
+ LogError("红包id:"..config.Id)
+ num=num+1
+ end
+ end
+ end
+ this.PackageNum=num
+ if func then
+ func(msg)
+ end
+ end)
+
+end
+--获取红包数据
+function MyGuildManager.GetRedPackageNum()
+ return this.PackageNum
+end
-- 获取我的公会信息
function MyGuildManager.GetMyGuildInfo()
@@ -177,6 +205,25 @@ end
function MyGuildManager.GetMyGuildMemList()
return this.MyGuildMemList
end
+--获取福利红包数据
+function MyGuildManager.GetMyGuidRedPackage()
+ return this.MyGuidRedPackage
+end
+--设置福利红包数据
+function MyGuildManager.SetMyGuidRedPackage(data)
+ local list={}
+ if data then
+ for key, value in pairs(data) do
+ if value.id then
+ LogError(" package id =="..value.id.." num=="..value.num)
+ local data={}
+ data.num=value.num
+ list[value.id]=data
+ end
+ end
+ end
+ this.MyGuidRedPackage=list
+end
-- 获取我的公会的会长信息
function MyGuildManager.GetMyGuildMasterInfo()
diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua
index 5ccdf6054f..0f91181b4d 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua
@@ -11,11 +11,49 @@ end
-- 检查公会红包红点
function this.CheckGuildRedPacketRedPoint()
-- Log(""..tostring(this.isCheck).."")
- if this.isCheck then
- return this.isCheck
+ -- if this.isCheck then
+ -- return this.isCheck
+ -- else
+ -- return false
+ -- end
+ LogError("检测发红包红点")
+ local list=MyGuildManager.GetMyGuidRedPackage()
+ if list then
+ for key, value in pairs(list) do
+ if value.num>0 then
+ return true
+ end
+ end
+ end
+ return false
+end
+function this.CheckIsCanGetPackage()
+
+ -- NetManager.GetAllRedPacketResponse(function(msg)
+
+ -- -- local data={}
+ -- -- for i,v in ipairs(msg.info) do
+ -- -- table.insert(data,v)
+ -- -- end
+
+ -- local dataLength=#msg.info
+ -- LogError("+++++++++++++++ "..dataLength )
+ -- if dataLength>0 then
+ -- return true
+ -- end
+
+ -- return false
+ -- end)
+ LogError("can send package num:"..MyGuildManager.PackageNum)
+ if MyGuildManager.PackageNum>0 then
+ Game.GlobalEvent:DispatchEvent(GameEvent.Chat.OnRedPackageNumChanged)
+ return true
else
+ Game.GlobalEvent:DispatchEvent(GameEvent.Chat.OnRedPackageNumChanged)
return false
end
+
end
+
return this
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPanel.lua
index 59ef51acb2..78051dc6cb 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPanel.lua
@@ -9,25 +9,29 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1) }
local _TabData = {
[1]= {txt = Language[11037]},
- [2]= {txt = Language[11038]},
- [3]= {txt = Language[11039]},
+ [2]= {txt = "发福利红包"},
+ [3]= {txt = Language[11038]},
+ [4]= {txt = Language[11039]},
}
--子模块脚本
this.contents = {
--主面板
[1] = {view = require("Modules/Guild/RedPacketView/RedPacket_SendView"), panelName = "SendView"},
+ --发送福利红包
+ [2] = {view = require("Modules/Guild/RedPacketView/RedPacket_SendWealView"), panelName = "SendWealView"},
--天官赐福
- [2] = {view = require("Modules/Guild/RedPacketView/RedPacket_GetView"), panelName = "GetView"},
+ [3] = {view = require("Modules/Guild/RedPacketView/RedPacket_GetView"), panelName = "GetView"},
--每日仙缘礼
- [3] = {view = require("Modules/Guild/RedPacketView/RedPacket_RankView"), panelName = "RankView"},
+ [4] = {view = require("Modules/Guild/RedPacketView/RedPacket_RankView"), panelName = "RankView"},
}
-- this.contentPanel={}
this.sortingOrder = 0
+this.curIndex=1
--初始化组件(用于子类重写)
function RedPacketPanel:InitComponent()
this.panel=Util.GetGameObject(self.gameObject, "Panel")
this.backBtn=Util.GetGameObject(this.panel,"BackBtn")
- this.tabbox = Util.GetGameObject(this.panel, "TabBox")
+ this.tabbox = Util.GetGameObject(this.panel, "Contents/TabBox")
this.content=Util.GetGameObject(this.panel,"Contents")
this.contentPanel={}
@@ -69,21 +73,39 @@ function RedPacketPanel:RemoveListener()
end
--界面打开时调用(用于子类重写)
-function RedPacketPanel:OnOpen()
-
+function RedPacketPanel:OnOpen(index)
+ if index then
+ this.curIndex=index
+ end
end
+local redPointList
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function RedPacketPanel:OnShow()
- BindRedPointObject(RedPointType.Guild_RedPacket,this.redPoint)
- CheckRedPointStatus(RedPointType.Guild_RedPacket)
+ -- BindRedPointObject(RedPointType.Guild_RedPacket,this.redPoint)
+
this.tabbox:SetActive(true)
this.TabCtrl = TabBox.New()
this.TabCtrl:SetTabAdapter(this.TabAdapter)
this.TabCtrl:SetChangeTabCallBack(this.OnTabChange)
- this.TabCtrl:Init(this.tabbox, _TabData)
+ this.TabCtrl:Init(this.tabbox, _TabData,this.curIndex)
+
+ redPointList = {}
+ for i = 1, Util.GetGameObject(this.tabbox,"box").transform.childCount do
+ redPointList[i] =Util.GetGameObject(Util.GetGameObject(this.tabbox,"box").transform:GetChild(i-1).gameObject,"RedPoint")
+ redPointList[i]:SetActive(false)
+ end
+
+ if redPointList[2] and redPointList[3] then
+ BindRedPointObject(RedPointType.Guid_SendPackage, redPointList[2])
+ BindRedPointObject(RedPointType.Guid_GetPackage, redPointList[3])
+ end
+ CheckRedPointStatus(RedPointType.Guid_SendPackage)
+ CheckRedPointStatus(RedPointType.Guid_GetPackage)
end
+
+
--重设层级
function RedPacketPanel:OnSortingOrderChange()
this.sortingOrder = self.sortingOrder
diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPopup.lua
index 11d166b761..7591d058f4 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacketPopup.lua
@@ -4,7 +4,7 @@ local this=RedPacketPopup
this.playerScrollHead={}--滚动条头像
this.sendPlayerHead={}--发送者头像
--红包资源名
-local RedPacketName={"g_ghhb_ming_01_zh","g_ghhb_ming_02_zh","g_ghhb_ming_03_zh"}
+local RedPacketName={"g_ghhb_ming_01_zh","g_ghhb_ming_02_zh","g_ghhb_ming_03_zh","g_ghhb_ming_04_zh"}
--红包按钮状态图片
local BtnStateImage={"g_ghhb_qiang","g_ghhb_lingqu","g_ghhb_lingwan"}--抢 已领取 已领完
@@ -71,9 +71,17 @@ end
--初始化面板
function this.InitView(redId,id)
local config=ConfigManager.GetConfigData(ConfigName.GuildRedPackConfig,id)
-
- this.title.sprite=Util.LoadSprite(RedPacketName[id])
- this.titleTip.text=GetLanguageStrById(config.SendWord)
+ local index=id
+ if index>3 then
+ index=4
+ end
+ this.title.sprite=Util.LoadSprite(RedPacketName[index])
+ if config.BaseType==1 then
+ this.titleTip.text=GetLanguageStrById(config.SendWord)
+ elseif config.BaseType==2 then
+ this.titleTip.text=GetLanguageStrById(config.RuleDes)
+ end
+
NetManager.GetRedPackageDetailRequest(redId,function(msg)
-- logWarnTrance(TimeToDHMS(msg.remainTime))
diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
index 534d423db1..dd2f687b96 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
@@ -1,11 +1,12 @@
----- 公会红包-抢红包 -----
-local this = {}
+this={}
local sortingOrder=0
--红包资源名
-local RedPacketName={"g_ghhb_ming_01_zh","g_ghhb_ming_02_zh","g_ghhb_ming_03_zh"}
+local RedPacketName={"g_ghhb_ming_01_zh","g_ghhb_ming_02_zh","g_ghhb_ming_03_zh","g_ghhb_ming_04_zh"}
--红包按钮状态图片
local BtnStateImage={"g_ghhb_qiang_zh","g_ghhb_lingqu_zh","g_ghhb_lingwan_zh"}--抢 已领取 已领完
+
function this:InitComponent(gameObject)
this.group=Util.GetGameObject(gameObject,"Root/Group")--红包父节点
this.noInfo=Util.GetGameObject(gameObject,"NoInfo")--无红包提示
@@ -20,16 +21,26 @@ end
function this:BindEvent()
+
end
function this:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.GuildRedPacket.OnRefreshGetRedPacket, this.InitGetView)
+ Game.GlobalEvent:AddEvent(GameEvent.GuildRedPacket.AuoGetRedPackage, this.AutoGetRedPackage)
end
function this:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.GuildRedPacket.OnRefreshGetRedPacket, this.InitGetView)
+ Game.GlobalEvent:RemoveEvent(GameEvent.GuildRedPacket.AuoGetRedPackage, this.AutoGetRedPackage)
end
+local isAuto=false
+--自动抢红包
+function this:AutoGetRedPackage()
+ isAuto=true
+end
+
+
function this:OnShow(_sortingOrder)
-- logWarnTrance("打开抢红包")
sortingOrder=_sortingOrder
@@ -38,6 +49,7 @@ end
function this:OnClose()
-- logWarnTrance("关闭抢红包")
+ isAuto=false
end
function this:OnDestroy()
@@ -47,6 +59,7 @@ end
--初始化抢红包面板
function this:InitGetView()
local dataLength=0
+ isAuto=false
NetManager.GetAllRedPacketResponse(function(msg)
-- logWarnTrance(#msg.info)
-- for index, value in ipairs(msg.info) do
@@ -57,19 +70,58 @@ function this:InitGetView()
for i,v in ipairs(msg.info) do
table.insert(data,v)
end
+ LogError("len=========="..LengthOfTable(data))
this:DataSort(data)
dataLength=#msg.info
this.noInfo:SetActive(dataLength==0)
-
this.scrollView:SetData(data,function(index,root)
this:SetView(root,data[index])
end)
this.scrollView:SetIndex(1)
+ if isAuto then
+ local SpecialConfig=ConfigManager.GetConfigData(ConfigName.SpecialConfig,115)
+ for key, value in pairs(data) do
+ local config=ConfigManager.GetConfigData(ConfigName.GuildRedPackConfig,value.redType)
+ if value.isGet==0 and (config.Num-value.getCount)>0 and isAuto then
+ if config.BaseType~=2 or PlayerManager.dailyRedPack< tonumber(SpecialConfig.Value) then
+ isAuto=false
+ LogError("redid============"..value.redId)
+ NetManager.GetRobRedPackageRequest(value.redId,function(msg)
+ local success=msg.isSuccess
+ local itemId=msg.itemId
+ local count=msg.count
+ if success==1 then--红包抢成功
+ local itemName=GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId).Name)
+ UIManager.OpenPanel(UIName.RedPacketPopup,config.Id,value.redType)
+ --红包类型大于3的是福利红包
+ if value.redType>3 then
+ PlayerManager.SettDailyRedPackageTime(PlayerManager.dailyRedPack+1)
+ end
+ MyGuildManager.ReuqsetRedPackage(function()
+ CheckRedPointStatus(RedPointType.Guid_GetPackage)
+ end)
+ PopupTipPanel.ShowTip(string.format(Language[11046],itemName,count))
+ else--抢红包失败
+ LogError(Language[11047])
+ PopupTipPanel.ShowTip(Language[11047])
+ end
+ this:InitGetView()
+ --检测可领取红包的数量
+ end)
+ return
+ end
+ end
+ end
+ end
end)
end
+
+
+
function this:SetView(root,data)
+ LogError("-------------------")
local nameImage=Util.GetGameObject(root,"NameImage"):GetComponent("Image")--红包名
local fromPlayer=Util.GetGameObject(root,"FromPlayer"):GetComponent("Text")--红包来自玩家名
local getBtn=Util.GetGameObject(root,"GetBtn")--抢红包按钮
@@ -77,10 +129,20 @@ function this:SetView(root,data)
local getBtnImage=Util.GetGameObject(root,"GetBtn/Image"):GetComponent("Image")--按钮状态图片
local numOrRecordBtn=Util.GetGameObject(root,"NumOrRecord")
local numOrRecordText=Util.GetGameObject(root,"NumOrRecord/Text"):GetComponent("Text")--剩余礼包数或查看记录
+ local getInfo=Util.GetGameObject(root,"GetInfo"):GetComponent("Text")--获取信息
local redId=data.redId
+ local redType=data.redType
+ if redType>3 then
+ redType=4
+ end
local config=ConfigManager.GetConfigData(ConfigName.GuildRedPackConfig,data.redType)
-
- nameImage.sprite=Util.LoadSprite(RedPacketName[data.redType])
+ if config.BaseType==1 then
+ getInfo.gameObject:SetActive(false)
+ else
+ getInfo.gameObject:SetActive(true)
+ getInfo.text=config.RuleDes
+ end
+ nameImage.sprite=Util.LoadSprite(RedPacketName[redType])
fromPlayer.text=Language[11042]..data.userName..""
getBtn:GetComponent("Button").interactable=(config.Num-data.getCount)~=0 and data.isGet==0 --抢红包按钮开关
@@ -92,6 +154,7 @@ function this:SetView(root,data)
numOrRecordText.text=Language[11043]
getBtnImage.sprite=Util.LoadSprite(BtnStateImage[2]) --Language[10101]
else
+ LogError("redid"..redId)
numOrRecordText.text=Language[10580]..(config.Num-data.getCount).."/"..config.Num
getBtnImage.sprite=Util.LoadSprite(BtnStateImage[1]) --Language[11044]
end
@@ -109,12 +172,20 @@ function this:SetView(root,data)
if success==1 then--红包抢成功
local itemName=GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ItemConfig,itemId).Name)
UIManager.OpenPanel(UIName.RedPacketPopup,redId,data.redType)
+ --红包类型大于3的是福利红包
+ if data.redType>3 then
+ PlayerManager.SettDailyRedPackageTime(PlayerManager.dailyRedPack+1)
+ end
PopupTipPanel.ShowTip(string.format(Language[11046],itemName,count))
+ MyGuildManager.ReuqsetRedPackage(function()
+ CheckRedPointStatus(RedPointType.Guid_GetPackage)
+ end)
else--抢红包失败
PopupTipPanel.ShowTip(Language[11047])
end
this:InitGetView()
end)
+
end)
Util.AddOnceClick(numOrRecordBtn,function()--查看记录
NetManager.GetRedPackageDetailRequest(redId,function(msg)
diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
index 112096e5c2..9e7a9083d0 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
@@ -260,6 +260,7 @@ function this.RechargeSuccessFunc(id)
this.SetInfo(curIndex)
--PopupTipPanel.ShowTip(string.format( Language[11051],GetLanguageStrById(redpack.Name)))
ChatManager.RequestSendRedPacket(curIndex)
+ CheckRedPointStatus(RedPointType.Guid_GetPackage)
end
return this
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendWealView.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendWealView.lua
new file mode 100644
index 0000000000..552e5e7a7e
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendWealView.lua
@@ -0,0 +1,151 @@
+----- 公会红包-发红包 -----
+local this = {}
+local sortingOrder=0
+local packageConfig=nil
+
+function this:InitComponent(gameObject)
+ this.itemPre=Util.GetGameObject(gameObject,"Item")
+ this.scrollRoot=Util.GetGameObject(gameObject,"scrollRect")
+ this.scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scrollRoot.transform,this.itemPre, nil,
+ Vector2.New(this.scrollRoot.transform.rect.width,this.scrollRoot.transform.rect.height),1,2,Vector2.New(80,100))
+ this.scrollView.moveTween.MomentumAmount = 1
+ this.scrollView.moveTween.Strength = 2
+ this.scrollView.gameObject:GetComponent("RectTransform").anchoredPosition= Vector2.New(0,0)
+ this.scrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5)
+ this.scrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5)
+ this.scrollView.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5)
+
+ this.infoTitle=Util.GetGameObject(gameObject,"infoPanel/Content/Title/Text"):GetComponent("Text")
+ this.infoTitle.text="福利红包"
+ Util.GetGameObject(gameObject,"infoPanel/Content/Text1"):GetComponent("Text").text="红包个数:"
+ Util.GetGameObject(gameObject,"infoPanel/Content/Text2"):GetComponent("Text").text="红包金额:"
+ this.numTxt=Util.GetGameObject(gameObject,"infoPanel/Content/numTxt"):GetComponent("Text")
+ this.sumTxt=Util.GetGameObject(gameObject,"infoPanel/Content/num2Txt"):GetComponent("Text")
+ this.rewardImg=Util.GetGameObject(gameObject,"infoPanel/Content/Image"):GetComponent("Image")
+ this.infoObj=Util.GetGameObject(gameObject,"infoPanel")
+ Util.AddClick(this.infoObj,function()
+ this.infoObj.gameObject:SetActive(false)
+ end)
+end
+
+
+
+function this:OnShow(_sortingOrder)
+ sortingOrder=_sortingOrder
+ this:InitView()
+end
+
+function this:BindEvent()
+
+end
+
+function this:AddListener()
+
+end
+
+function this:RemoveListener()
+
+end
+
+function this:OnClose()
+
+end
+
+function this:OnDestroy()
+
+end
+
+---初始化面板
+function this:InitView()
+ packageConfig=ConfigManager.GetConfig(ConfigName.GuildRedPackConfig)
+ if not packageConfig then
+ return
+ end
+ local packages=MyGuildManager.GetMyGuidRedPackage()
+ local showList={}
+
+ for key, value in pairs(packages) do
+ local config=packageConfig[key]
+ --福利红包并且在限定等级
+ if config and config.BaseType == 2 and PlayerManager.level>=config.Level then
+ -- if packages[i] then
+ value.config=config
+ table.insert(showList,value)
+ --end
+ end
+ end
+ if LengthOfTable(showList)==0 then
+ return
+ end
+table.sort(showList,function(a,b)
+ if a.num==b.num then
+ return a.config.Sortb.num -- body
+ end
+end)
+--设置滚动区信息
+this.scrollView:SetData(showList,function(index,root)
+ this:ShowItemInfo(root,showList[index])
+end)
+end
+--显示红包数据
+function this:ShowItemInfo(go,data)
+ if not data then
+ return
+ end
+ local nameImage=Util.GetGameObject(go,"NameImage"):GetComponent("Image")
+ local icon=Util.GetGameObject(go,"Icon"):GetComponent("Image")
+ local desTxt=Util.GetGameObject(go,"Desc"):GetComponent("Text")
+ local numTxt=Util.GetGameObject(go,"numTxt"):GetComponent("Text")
+ local btn_send=Util.GetGameObject(go,"btn_send")
+ local sendTxt=Util.GetGameObject(go,"btn_send/Text"):GetComponent("Text")
+ nameImage.sprite=Util.LoadSprite("g_ghhb_ming_04_zh")
+ icon.sprite=Util.LoadSprite(GetResourcePath(data.config.IconId))
+ desTxt.text= data.config.RuleDes
+ local num=data.num
+ numTxt.text="数量:"..data.num
+ btn_send:GetComponent("Button").interactable=num>0
+ Util.SetGray(btn_send,num<1)
+
+ --发红包按钮
+ Util.AddOnceClick(btn_send,function()
+ NetManager.RequestWelfareRedPacket(data.config.Id,function()
+ PopupTipPanel.ShowTip("成功发送福利红包!")
+ this:InitView()
+ --刷新发送福利红包按钮红点
+ CheckRedPointStatus(RedPointType.Guid_SendPackage)
+ MyGuildManager.ReuqsetRedPackage()
+ CheckRedPointStatus(RedPointType.Guid_GetPackage)
+ --发送公会信息
+ local redpack=ConfigManager.GetConfigData(ConfigName.GuildRedPackConfig,data.config.Id)
+ if not PlayerManager.familyId then return end
+ -- 构建字符串
+ local channel = CHAT_CHANNEL.FAMILY
+
+ local content = string.format(
+ "%d#%s#%s",--"%d#%d#%d#%s#%d#%d|",
+ GLOBAL_CHAT_TYPE.GUILD_REDPACKET,
+ PlayerManager.nickName,
+ redpack.Name
+ )
+ -- 发送消息
+ NetManager.RequestSendChatMsg(channel, content, 0, function()
+ local msgId = ChatManager.GetMsgIdFlag(channel)
+ NetManager.RequestChatMsg(channel, msgId, function(data)
+ end)
+ end)
+ end)
+ end)
+
+ --显示红包信息
+ Util.AddOnceClick(go,function()
+ this.infoObj.gameObject:SetActive(true)
+ this.numTxt.text=data.config.TotalMoney[1]
+ this.sumTxt.text=data.config.TotalMoney[2]
+ this.rewardImg.sprite=Util.LoadSprite(GetResourcePath(data.config.IconId))
+ end)
+
+
+end
+return this
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendWealView.lua.meta b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendWealView.lua.meta
new file mode 100644
index 0000000000..9228cccb96
--- /dev/null
+++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendWealView.lua.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d2eae81c520066e44bb39c7bba196373
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
index f322126f69..bb1df81cc5 100644
--- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
@@ -464,7 +464,8 @@ function this.ExecuteLoading()
function() NetManager.GetHeroSkinData(LoadingPanel.OnStep) end,
function() NetManager.HongMengInfoResponse(LoadingPanel.OnStep) end,
function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end,
- function() NetManager.HardStageRequest(LoadingPanel.OnStep) end,
+ function() MyGuildManager.ReuqsetRedPackage(LoadingPanel.OnStep) end,
+ --function() NetManager.HardStageRequest(LoadingPanel.OnStep) end,
--[[[35] =]] function() -- 登录请求最终接口,所有请求放在此接口之前
-- 登录成功确认
NetManager.LoginConfimRequest()
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
index 86b35705bd..06dbb64197 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
@@ -53,6 +53,8 @@ function this.RegisterMessage(network)
socket:RegistNetMessage(MessageTypeProto_pb.DEATH_PATH_STATUS_CHANGE_INDICATION, this.GuildRefreshDeathPosStatus)
socket:RegistNetMessage(MessageTypeProto_pb.DEATH_PATH_DO_REWARD_INDICATION, this.GuildDoRewardIndication)
socket:RegistNetMessage(MessageTypeProto_pb.DEATH_PATH_FIRST_CHANGE_INDICATION, this.GuildFirstChangeIndication)
+ --福利红包推送
+ socket:RegistNetMessage(MessageTypeProto_pb.WELFARE_RED_PACKET_INFO, this.WelfareRedPacketPush)
--
socket:RegistNetMessage(MessageTypeProto_pb.UPDATE_USER_EXP_INDICATION, this.UpdateUserExp)
--秘盒跨季度刷新
@@ -130,7 +132,22 @@ function this.RegisterMessage(network)
socket:RegistNetMessage(MessageTypeProto_pb.HARD_STAGE_INFO_RESPONSE, this.HardStageResponse)
-- 神印信息推送
socket:RegistNetMessage(MessageTypeProto_pb.PurpleMansionSealIndication, this.PracticeImprintData)
+
end
+
+--后端推送福利红包数据
+function this.WelfareRedPacketPush(buffer)
+ local data = buffer:DataByte()
+ local msg = PlayerInfoProto_pb.WelfareRedPacketPush()
+ msg:ParseFromString(data)
+ LogError("推送过来红包数据")
+ if msg.redpacket then
+ MyGuildManager.SetMyGuidRedPackage(msg.redpacket)
+ CheckRedPointStatus(RedPointType.Guid_SendPackage)
+ end
+ -- BagManager.BagIndicationRefresh(msg)
+end
+
function this.OpenHongMengTowerGuideIndication(buffer)
local data = buffer:DataByte()
local msg = HeroInfoProto_pb.HongmengSteleNewHandIndication()
@@ -754,6 +771,7 @@ end
-- 更新关卡ID
function this.FreshFightId(buffer)
Log("后端推送关卡状态!")
+ LogError("==============")
local data=buffer:DataByte()
local msg=FightInfoProto_pb.MainLevelFightUpdateIndication()
msg:ParseFromString(data)
diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
index a5cc10dd1a..f886589f28 100644
--- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
@@ -120,6 +120,7 @@ function this.PlayerInfoRequest(func)
PlayerManager.skin = msg.player.decrotion--皮肤
PlayerManager.ride = msg.player.ride--坐骑
PlayerManager.rideLevel = msg.player.rideLevel
+ PlayerManager.dailyRedPack=msg.dailyredpack
HeadManager.SetHeadFrameAllData(msg.headFrameBag)
if msg.player.sex then
NameManager.SetRoleSex(msg.player.sex)
@@ -1931,6 +1932,7 @@ end
-- 请求发送聊天数据
function this.RequestSendChatMsg(type, msg, friend, func)
+ LogError(tostring(msg))
if string.utf8len(msg) > 140 then
PopupTipPanel.ShowTip(Language[11345])
return
@@ -2514,6 +2516,23 @@ function this.RequestDismissGuild(dType, func)
end)
end
+-- 发送福利红包
+function this.RequestWelfareRedPacket(_id,func)
+ local data = PlayerInfoProto_pb.WelfareRedPacketSendRequest()
+ LogError("redpacket id==".._id)
+ data.id=_id
+ local msg = data:SerializeToString()
+ Network:SendMessageWithCallBack(MessageTypeProto_pb.WELFARE_RED_PACKET_SEND_REQUEST, MessageTypeProto_pb.WELFARE_RED_PACKET_SEND_RESPONSE, msg, function(buffer)
+ local data = buffer:DataByte()
+ local msg = PlayerInfoProto_pb.WelfareRedPacketSendResponse()
+ msg:ParseFromString(data)
+ MyGuildManager.SetMyGuidRedPackage(msg.redpacket)
+ if func then
+ func()
+ end
+ end)
+end
+
--请求公会行走
function this.GuildWalkRequest(pathList, func)
Log("FAMILY_WALK_REQUEST")
@@ -5068,7 +5087,7 @@ end
function NetManager.HardStageRequest(func)
local data = PlayerInfoProto_pb.HardStageRequest()
local msg = data:SerializeToString()
- Network:SendMessageWithCallBack(MessageTypeProto_pb.HARD_STAGE_INFO_REQUEST, MessageTypeProto_pb.HARD_STAGE_INFO_RESPONSE, msg, function(buffer)
+ Network:SendMessageWithCallBack(MessageTypeProto_pb.HARD_STAGE_INFO_REQUEST, MessageTypeProto_pb.HARD_STAGE_INFO_RESPONSE, msg, function(buffer)
local data = buffer:DataByte()
local msg = PlayerInfoProto_pb.HardStageResponse()
msg:ParseFromString(data)
@@ -5076,7 +5095,7 @@ function NetManager.HardStageRequest(func)
if func then
func(msg)
end
- end)
+ end)
end
--山河社稷图领取宝箱奖励
function NetManager.GetHardStageChapterReward(_chapterId,_rewradId,func)
diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
index 1a878df5cc..57b839311e 100644
--- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua
@@ -41,7 +41,8 @@ this.isRefreshMainPanelNpc = true
this.userSkinList = {}--[id] = {skinId , overTime}
this.userTitleList = {}--[id] = {titleId , overTime}
this.userMountList = {}--[id] = {mountId , overTime}
-
+--每日福利红包抢夺次数
+this.dailyRedPack = 0
local update = function()
local dt = Time.unscaledDeltaTime
this.serverTime = this.serverTime + dt
@@ -60,6 +61,16 @@ end
function this.InitServerTime()
UpdateBeat:Add(update, this)
end
+--获取公会福利红包抢夺次数
+function this.GetDailyRedPackageTime()
+ return this.dailyRedPack
+end
+
+--获取公会福利红包抢夺次数
+function this.SettDailyRedPackageTime(time)
+ this.dailyRedPack=time
+ LogError("time=="..this.dailyRedPack)
+end
function this.ResetLocalData(var)--初始化所有本地的每日一刷--1是五点推送、2是登陆检测
local func1 = function ()
diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
index 382083164a..ae6a3fb430 100644
--- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
@@ -251,7 +251,7 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.Guild_Apply, RedPointType.Guild_House_Apply)
RPData:SetParent(RedPointType.Guild_Shop, RedPointType.Guild)
RPData:SetParent(RedPointType.Guild_Boss, RedPointType.Guild)
- --RPData:SetParent(RedPointType.Guild_RedPacket, RedPointType.Guild)
+ RPData:SetParent(RedPointType.Guild_RedPacket, RedPointType.Guild)
RPData:SetParent(RedPointType.Guild_Fete, RedPointType.Guild)
RPData:SetParent(RedPointType.Guild_Aid, RedPointType.Guild)
RPData:SetParent(RedPointType.Guild_AidMy, RedPointType.Guild_Aid)
@@ -260,7 +260,8 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.Guild_Transcript, RedPointType.Guild)
RPData:SetParent(RedPointType.Guild_Skill, RedPointType.Guild)
RPData:SetParent(RedPointType.Guild_DeathPos, RedPointType.Guild)
-
+ RPData:SetParent(RedPointType.Guid_SendPackage, RedPointType.Guild_RedPacket)
+ RPData:SetParent(RedPointType.Guid_GetPackage, RedPointType.Guild_RedPacket)
RPData:SetParent(RedPointType.Chat_Friend, RedPointType.Chat)
-- 东海寻仙
RPData:SetParent(RedPointType.FindFairy_OneView, RedPointType.FindFairy)
@@ -446,6 +447,8 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.Guild_Skill, GuildSkillManager.RefreshAllGuildSkillRedPoint)
-- 公会红包
--RPData:AddCheckFunc(RedPointType.Guild_RedPacket,GuildRedPacketManager.CheckGuildRedPacketRedPoint)
+ RPData:AddCheckFunc(RedPointType.Guid_SendPackage,GuildRedPacketManager.CheckGuildRedPacketRedPoint)
+ RPData:AddCheckFunc(RedPointType.Guid_GetPackage,GuildRedPacketManager.CheckIsCanGetPackage)
--公会祭祀
RPData:AddCheckFunc(RedPointType.Guild_Fete,MyGuildManager.CheckGuildFeteRedPoint)
--公会十绝阵
diff --git a/Assets/ManagedResources/~Lua/View/ChatTipView.lua b/Assets/ManagedResources/~Lua/View/ChatTipView.lua
index eef1b2a65a..f4bb5a6132 100644
--- a/Assets/ManagedResources/~Lua/View/ChatTipView.lua
+++ b/Assets/ManagedResources/~Lua/View/ChatTipView.lua
@@ -24,6 +24,7 @@ function ChatTipView:InitComponent()
self.btn = Util.GetGameObject(self.transform, "button")
self.content = Util.GetGameObject(self.transform, "content"):GetComponent("Text")
self.redpot = Util.GetGameObject(self.transform, "icon/redpot")
+ self.redPackage = Util.GetGameObject(self.transform, "Image")
end
--绑定事件(用于子类重写)
@@ -35,25 +36,42 @@ function ChatTipView:BindEvent()
UIManager.OpenPanel(UIName.ChatPanel, 2, 2)
end
end)
+ Util.AddClick(self.redPackage,function()
+ UIManager.OpenPanel(UIName.RedPacketPanel,3)
+ Game.GlobalEvent:DispatchEvent(GameEvent.GuildRedPacket.AuoGetRedPackage)
+ end)
end
--添加事件监听(用于子类重写)
function ChatTipView:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Chat.OnMainChatChanged, self.RefreshChatShow, self)
-
+ Game.GlobalEvent:AddEvent(GameEvent.Chat.OnRedPackageNumChanged, self.CheckRedPackageShow, self)
BindRedPointObject(RedPointType.Chat, self.redpot)
end
--移除事件监听(用于子类重写)
function ChatTipView:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Chat.OnMainChatChanged, self.RefreshChatShow, self)
-
+ Game.GlobalEvent:RemoveEvent(GameEvent.Chat.OnRedPackageNumChanged, self.CheckRedPackageShow, self)
ClearRedPointObject(RedPointType.Chat, self.redpot)
end
+function ChatTipView:CheckRedPackageShow()
+ if MyGuildManager.PackageNum>0 then
+ self.redPackage.gameObject:SetActive(true)
+ self.freeBtnAnim.enabled=true
+ else
+ self.redPackage.gameObject:SetActive(false)
+ end
+end
--界面打开时调用(用于子类重写)
function ChatTipView:OnOpen(viewType)
self._ViewType = viewType or VIEW_TYPE.MAIN
+ if MyGuildManager.PackageNum>0 then
+ self.redPackage.gameObject:SetActive(true)
+ else
+ self.redPackage.gameObject:SetActive(false)
+ end
self:RefreshChatShow()
end