更新提示的放大镜效果

Assets/Art/Animation.meta

+fileFormatVersion: 2
+guid: db433faaea0a5d540ac2812a035e1ce3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Animation/Tip_Ani.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Tip_Ani
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 1, y: 1, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.6666667
+        value: {x: 1.2, y: 1.2, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 1.3333334
+        value: {x: 1, y: 1, z: 1}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.7019608
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 0.5058824
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.3333334
+        value: 0.7019608
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.a
+    path: 
+    classID: 114
+    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+    flags: 0
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 304273561
+      script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.3333334
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.7019608
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 0.5058824
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.3333334
+        value: 0.7019608
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Color.a
+    path: 
+    classID: 114
+    script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 1.2
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.3333334
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.x
+    path: 
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 1.2
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.3333334
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.y
+    path: 
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.3333334
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.z
+    path: 
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Assets/Art/Animation/Tip_Ani.anim.meta

+fileFormatVersion: 2
+guid: 09186b8faaf082f478b53db7efce492c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Animation/Tip_Image.controller

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Tip_Image
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 6679167179097606636}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &5081504381139785328
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Tip_Ani
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 09186b8faaf082f478b53db7efce492c, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &6679167179097606636
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 5081504381139785328}
+    m_Position: {x: 200, y: 0, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 5081504381139785328}

Assets/Art/Animation/Tip_Image.controller.meta

+fileFormatVersion: 2
+guid: ffbdd1cd0aabfa049b348f3a1b771e62
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/GameEnd/提示的放大镜.png.meta

+fileFormatVersion: 2
+guid: 9794e209cf586c04d82f6dae7af363bf
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 1
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/perfabs/GameMgr.prefab

@@ -616,10 +616,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 300
-    m_Right: 300
-    m_Top: 300
-    m_Bottom: 300
+    m_Left: 400
+    m_Right: 400
+    m_Top: 400
+    m_Bottom: 400
   m_ChildAlignment: 4
   m_Spacing: 0
   m_ChildForceExpandWidth: 1
@@ -5562,6 +5562,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2902754919140836122}
+  - {fileID: 754384551654227333}
   m_Father: {fileID: 3288970237706169799}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5607,7 +5608,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 300, y: 0}
+  m_AnchoredPosition: {x: 400, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4535739684591336511
@@ -6164,6 +6165,7 @@ MonoBehaviour:
   Min_Move: 0.23
   Max_Move: 8
   group: {fileID: 237648084539702437}
+  Tip_Pic: {fileID: 5046652553632910035}
 --- !u!1 &6884362798581633399
 GameObject:
   m_ObjectHideFlags: 0
@@ -6223,6 +6225,104 @@ MonoBehaviour:
   curCount: 0
   count: 0
   step: 0
+--- !u!1 &7155274980848011599
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 754384551654227333}
+  - component: {fileID: 4578999573755579541}
+  - component: {fileID: 5046652553632910035}
+  - component: {fileID: 8754209159466854011}
+  m_Layer: 5
+  m_Name: Tip_Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &754384551654227333
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7155274980848011599}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3718553484409595390}
+  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, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4578999573755579541
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7155274980848011599}
+  m_CullTransparentMesh: 1
+--- !u!114 &5046652553632910035
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7155274980848011599}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 9794e209cf586c04d82f6dae7af363bf, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!95 &8754209159466854011
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7155274980848011599}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: ffbdd1cd0aabfa049b348f3a1b771e62, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &8495604213876096662
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/gameScene.unity

@@ -257,7 +257,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &39056318
 RectTransform:
   m_ObjectHideFlags: 0
@@ -5789,9 +5789,9 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 9106039126864166767}
-        m_TargetAssemblyTypeName: GroupListManager, Assembly-CSharp
-        m_MethodName: FindGroupArea_Btn
+      - m_Target: {fileID: 8094727572906316439}
+        m_TargetAssemblyTypeName: Gameing, Assembly-CSharp
+        m_MethodName: FindArea_Btn
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}

Assets/scripts/EventName.cs

@@ -42,6 +42,7 @@ public static class EventName
 
         public const string Event_ImageScallChange = "Event_ImageScallChange";  //图片的缩放改变
         public const string Event_ReSetPicPos_Scale = "Event_ReSetPicPos_Scale";  //重新设置图片的位置和缩放
+        public const string Event_CloseTipImage = "Event_CloseTipImage";  //关闭提示图片
 
         public const string Event_StrtRecording = "Event_StrtRecording";  //开始录屏
         public const string Event_StopRecording = "Event_StopRecording"; //停止录屏

Assets/scripts/ScaleToImage.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;
+using static UnityEngine.GraphicsBuffer;
 
 public class ScaleToImage : MonoBehaviour
 {
@@ -23,6 +24,8 @@ public class ScaleToImage : MonoBehaviour
     public float Max_Move;
     public HorizontalLayoutGroup group;
 
+    public Image Tip_Pic;
+
     private Vector3 ToFigerCenter; //指向手指中间的向量
     private float ToFigerdistance; //距离
 
@@ -46,8 +49,11 @@ public class ScaleToImage : MonoBehaviour
     private Vector3 OnInitPos;
 
     private int groupInitSize;
+
+   
     private void Start()
     {
+        Tip_Pic.gameObject.SetActive(false);
         canvasCamera = transform.parent.GetComponent<ScaleToImage>().canvasCamera;
         groupInitSize = group.padding.left;
         RegisterEvent(true);
@@ -63,6 +69,7 @@ public class ScaleToImage : MonoBehaviour
     private void RegisterEvent(bool flag)
     {
         EventDispatcher.RegisterEvent(EventName.Event.Event_ReSetPicPos_Scale, ResetPos_Scale, flag);
+        EventDispatcher.RegisterEvent(EventName.Event.Event_CloseTipImage, CloseTipImage, flag);
     }
 
     private void ResetPos_Scale(object[] values)
@@ -134,12 +141,22 @@ public class ScaleToImage : MonoBehaviour
             }
 
         }
+
+        if (TipImageCloseTime <= 2)
+        {
+            TipImageCloseTime += Time.deltaTime;
+        }
+        else
+        {
+            CloseTipAni();
+        }
     }
 
     private void RefreshScrollview()
     {
         target.gameObject.SetActive(false);
         target.gameObject.SetActive(true);
+
         scrollRect.inertia = true;
     }
     private void StopScaleToSetSize()
@@ -158,10 +175,12 @@ public class ScaleToImage : MonoBehaviour
 
         float value = groupInitSize / scalesize;
 
+        var sizevalue =  (float)Screen.height/ (float)Screen.width;
+
         group.padding.left = (int)value;
         group.padding.right = (int)value;
-        group.padding.top = (int)value;
-        group.padding.bottom = (int)value;
+        group.padding.top = (int)(value * sizevalue);
+        group.padding.bottom = (int)(value* sizevalue);
 
 
     }
@@ -275,8 +294,59 @@ public class ScaleToImage : MonoBehaviour
             ScaleSize_List.Clear();
             ChangeFontSize(NowScale);
         }
+    }
+
+    private float getScale(int fontsize)
+    {
+        int num = fontsize - 3;
+
+        float scale = 7 - num * 0.5f - 1;
+
+        scale = Mathf.Min(7, scale);
+        scale=Mathf.Max(scale, 1);
+        return scale;
+    }
+    public void MovetoTarget(Vector3 topos, int fontsize)
+    {
+        SetscrollRectEnable(false);
+
+        float scale = getScale(fontsize);
+        target.localScale = Vector3.one* scale;
+        target.GetComponent<RectTransform>().anchoredPosition = -(topos)* scale;
+
+        target.GetComponent<ContentSizeFitter>().enabled = false;
+        target.GetComponent<ContentSizeFitter>().enabled = true;
+        RefreshScrollview();
+        StartCoroutine(DelayRefresh());
+
+        TipImageCloseTime = 0;
+        Tip_Pic.gameObject.SetActive(true);
+        ChangeFontSize(scale);
+        //Tip_Pic.transform.position = -target.position;
+    }
+
+    IEnumerator DelayRefresh()
+    {
+        yield return null;
+        yield return null;
+        target.GetComponent<ContentSizeFitter>().enabled = false;
+        target.GetComponent<ContentSizeFitter>().enabled = true;
+        yield return null;
+        SetscrollRectEnable(true);
 
     }
+
+    private float TipImageCloseTime;
+    private void CloseTipImage(object[] values)
+    {
+        CloseTipAni();
+    }
+    public void CloseTipAni()
+    {
+        Tip_Pic.gameObject.SetActive(false);
+    }
+
+    #region 鼠标滚轮
     private void MouseScale()
     {
         var mousepos = Input.mousePosition;
@@ -372,6 +442,8 @@ public class ScaleToImage : MonoBehaviour
 
         }
     }
+
+    #endregion
     private void SetscrollRectEnable(bool enable)
     {
         scrollRect.enabled = enable;

Assets/scripts/Views/gameScene/Gameing.cs

@@ -48,4 +48,26 @@ public class Gameing : MonoBehaviour
         EventDispatcher.Dispatch(EventName.Event.Event_ReSetPicPos_Scale);
     }
 
+    public void FindArea_Btn()
+    {
+        if (GroupListManager.Instance.HaveSelectGroup())
+        {
+            var data = GameMgr.Ins.LookFor();
+            if (data != null)
+            {
+                var jsondata = GameMgr.Ins.md.json;
+                float weidth = jsondata.width;
+                float height = jsondata.height;
+
+                Vector3 center = new Vector3(weidth / 2f, height / 2f, 0);
+
+                Vector3 pointpos = new Vector3(data.px - weidth / 2f, data.py - height / 2f, 0);
+
+
+                GameMgr.Ins.GetComponent<ScaleToImage>().MovetoTarget(pointpos, data.pr);
+            }
+
+
+        }
+    }
 }

Assets/scripts/Views/maingame/GroupListManager.cs

@@ -133,6 +133,7 @@ public class GroupListManager : MonoBehaviour
         }
         SetTotalProcress();
         EventDispatcher.Dispatch(EventName.Event.Event_GroupItemSelect);
+        EventDispatcher.Dispatch(EventName.Event.Event_CloseTipImage);
     }
 
     private void SetTotalProcress()
@@ -247,7 +248,7 @@ public class GroupListManager : MonoBehaviour
                 if (NowJindu >= 1)
                     continue;
                 tran = Content.transform.GetChild(index);
-                var coloritem = InitItem(tran, item, dynamic.GetCountById(item.id), dynamic.GetCountById(item.id) + item.roomIds.Count);
+                var coloritem = InitItem(tran, item, dynamic.GetCountById(item.id), item.roomIds.Count);
                 coloritem.index = index;
                 index++;
                 AllItem.Add(coloritem);
@@ -264,7 +265,7 @@ public class GroupListManager : MonoBehaviour
                 if (NowJindu >= 1)
                     continue;
                 tran = Content.transform.GetChild(index);
-                var coloritem = InitItem(tran, item, dynamic.GetCountById(item.id), dynamic.GetCountById(item.id) + item.roomIds.Count);
+                var coloritem = InitItem(tran, item, dynamic.GetCountById(item.id), item.roomIds.Count);
                 coloritem.index = index;
                 index++;
                 AllItem.Add(coloritem);
@@ -281,7 +282,7 @@ public class GroupListManager : MonoBehaviour
                     continue;
 
                 tran = GameObject.Instantiate(GroupItem_Obj).transform;
-                var coloritem = InitItem(tran, item, dynamic.GetCountById(item.id), dynamic.GetCountById(item.id)+ item.roomIds.Count);
+                var coloritem = InitItem(tran, item, dynamic.GetCountById(item.id),item.roomIds.Count);
                 coloritem.index = index;
                 index++;
                 AllItem.Add(coloritem);
@@ -386,6 +387,12 @@ public class GroupListManager : MonoBehaviour
         }
     }
 
+    public bool HaveSelectGroup()
+    {
+        var item = AllItem.FirstOrDefault((a) => a.IsSelect);
+        return item != null;
+    }
+
     //提示按钮
     public void FindGroupArea_Btn()
     {

Assets/scripts/perfabItems/colorItem.cs

@@ -224,6 +224,8 @@ public class colorItem : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
         }
         GroupListManager.Instance.ClickItem(GID, index);
         GameMgr.Ins.ChooseGroup(GID);
+
+        EventDispatcher.Dispatch(EventName.Event.Event_CloseTipImage);
     }
 
     public void SetLocalRootPos() //保存一下第一个的原始坐标