Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -2538,137 +2538,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0.5, y: -84.2}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &3886282185563919857
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 1177809280148261388}
-  - component: {fileID: 1117134768091027707}
-  - component: {fileID: 1812939589444416572}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1177809280148261388
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3886282185563919857}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 2264, y: -1, z: -1090}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2859865283014944201}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!20 &1117134768091027707
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3886282185563919857}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 2
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_Iso: 200
-  m_ShutterSpeed: 0.005
-  m_Aperture: 16
-  m_FocusDistance: 10
-  m_FocalLength: 50
-  m_BladeCount: 5
-  m_Curvature: {x: 2, y: 11}
-  m_BarrelClipping: 0.25
-  m_Anamorphism: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 2048
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 8600000, guid: 7c104613c1a917040b2d76911cfd15d7, type: 2}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_enableGDRP: 1
-  m_backfaceCulling: 0
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!114 &1812939589444416572
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3886282185563919857}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_RenderShadows: 1
-  m_RequiresDepthTextureOption: 2
-  m_RequiresOpaqueTextureOption: 2
-  m_CameraType: 0
-  m_Cameras: []
-  m_RendererIndex: -1
-  m_VolumeLayerMask:
-    serializedVersion: 2
-    m_Bits: 0
-  m_VolumeTrigger: {fileID: 0}
-  m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 0
-  m_Antialiasing: 0
-  m_AntialiasingQuality: 2
-  m_StopNaN: 0
-  m_Dithering: 0
-  m_ClearDepth: 1
-  m_AllowXRRendering: 1
-  m_AllowHDROutput: 1
-  m_UseScreenCoordOverride: 0
-  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
-  m_RequiresDepthTexture: 0
-  m_RequiresColorTexture: 0
-  m_Version: 2
-  m_TaaSettings:
-    m_Quality: 3
-    m_FrameInfluence: 0.1
-    m_JitterScale: 1
-    m_MipBias: 0
-    m_VarianceClampScale: 0.9
-    m_ContrastAdaptiveSharpening: 0
 --- !u!1 &4227657418625520249
 GameObject:
   m_ObjectHideFlags: 0
@@ -3069,7 +2938,6 @@ RectTransform:
   - {fileID: 6945085581065943726}
   - {fileID: 5064725350204833939}
   - {fileID: 8254445196056779358}
-  - {fileID: 1177809280148261388}
   - {fileID: 1155106644705196333}
   - {fileID: 871529640652062368}
   - {fileID: 3715210936838745054}
@@ -5439,11 +5307,6 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: CameraRoot
-    gameObject: {fileID: 1177809280148261388}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: Text_TuPo
     gameObject: {fileID: 2682066832374116098}
     isAssetBundle: 0

Assets/Res/UI/MainHeroPanel/MainHeroPanel.prefab

@@ -1,137 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &17674188837841093
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3387212356099446714}
-  - component: {fileID: 7386771212239786002}
-  - component: {fileID: 9178147150454144674}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &3387212356099446714
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 17674188837841093}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 2264, y: -1, z: -1090}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 4851310172027003331}
-  m_Father: {fileID: 9037135992368401232}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!20 &7386771212239786002
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 17674188837841093}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 2
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_Iso: 200
-  m_ShutterSpeed: 0.005
-  m_Aperture: 16
-  m_FocusDistance: 10
-  m_FocalLength: 50
-  m_BladeCount: 5
-  m_Curvature: {x: 2, y: 11}
-  m_BarrelClipping: 0.25
-  m_Anamorphism: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 40
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 2048
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 8600000, guid: 7c104613c1a917040b2d76911cfd15d7, type: 2}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_enableGDRP: 1
-  m_backfaceCulling: 0
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!114 &9178147150454144674
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 17674188837841093}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_RenderShadows: 1
-  m_RequiresDepthTextureOption: 2
-  m_RequiresOpaqueTextureOption: 2
-  m_CameraType: 0
-  m_Cameras: []
-  m_RendererIndex: -1
-  m_VolumeLayerMask:
-    serializedVersion: 2
-    m_Bits: 0
-  m_VolumeTrigger: {fileID: 0}
-  m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 0
-  m_Antialiasing: 0
-  m_AntialiasingQuality: 2
-  m_StopNaN: 0
-  m_Dithering: 0
-  m_ClearDepth: 1
-  m_AllowXRRendering: 1
-  m_AllowHDROutput: 1
-  m_UseScreenCoordOverride: 0
-  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
-  m_RequiresDepthTexture: 0
-  m_RequiresColorTexture: 0
-  m_Version: 2
-  m_TaaSettings:
-    m_Quality: 3
-    m_FrameInfluence: 0.1
-    m_JitterScale: 1
-    m_MipBias: 0
-    m_VarianceClampScale: 0.9
-    m_ContrastAdaptiveSharpening: 0
 --- !u!1 &320310589377205941
 GameObject:
   m_ObjectHideFlags: 0
@@ -944,95 +812,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
---- !u!1 &2511117555354478962
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4851310172027003331}
-  - component: {fileID: 187336073246267698}
-  m_Layer: 11
-  m_HasEditorInfo: 1
-  m_Name: dec_juxing_fang
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4851310172027003331
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2511117555354478962}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 410.5684, y: 223.135, z: 1961}
-  m_LocalScale: {x: 2927.9417, y: 3731.1638, z: 1000}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 3387212356099446714}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &187336073246267698
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2511117555354478962}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_ShadingRate: 0
-  m_ForceDisableGRD: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 02b70e3a04ca73d43b1c980bb9b7c829, type: 3}
-  m_Color: {r: 0.34117648, g: 0.44313726, b: 0.47058824, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 1, y: 1}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
 --- !u!1 &2683972799645630233
 GameObject:
   m_ObjectHideFlags: 0
@@ -2008,79 +1787,6 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1 &8627860104567905175
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8585431063593195554}
-  - component: {fileID: 50251756342390870}
-  - component: {fileID: 2161228190077776003}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: HeroRoot
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &8585431063593195554
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8627860104567905175}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.98, y: 1.98, z: 1.98}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 9037135992368401232}
-  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: -199, y: 229}
-  m_SizeDelta: {x: 432.16, y: 477.9211}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &50251756342390870
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8627860104567905175}
-  m_CullTransparentMesh: 1
---- !u!114 &2161228190077776003
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8627860104567905175}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 8600000, guid: 7c104613c1a917040b2d76911cfd15d7, type: 2}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
 --- !u!1 &8709778843362506203
 GameObject:
   m_ObjectHideFlags: 0
@@ -2287,14 +1993,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3387212356099446714}
   - {fileID: 8245128900902318849}
   - {fileID: 2076737625111562653}
   - {fileID: 2445365177016886875}
   - {fileID: 2702747051048812481}
   - {fileID: 6315757955565689560}
   - {fileID: 2816985101069546935}
-  - {fileID: 8585431063593195554}
   - {fileID: 3568202501178809802}
   - {fileID: 600135753646096457}
   - {fileID: 2863754501915732489}
@@ -2345,11 +2049,6 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: CameraRoot
-    gameObject: {fileID: 3387212356099446714}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1001 &4255811843327571130
 PrefabInstance:

Assets/Res/UI/SettingPanel/SettingPanel.prefab

@@ -33,11 +33,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1859887993827162509}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4160643369365326472}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -143, y: 638.0681}
+  m_AnchoredPosition: {x: -143, y: 344}
   m_SizeDelta: {x: 253, y: 80}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &6357437177905045585
@@ -165,7 +165,20 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 2595853774863234435}
+  - {fileID: 3335154821151865286}
+  - {fileID: 1775611361754384282}
+  - {fileID: 5355010681599763548}
+  - {fileID: 3463984699172484862}
+  - {fileID: 2829838969233991924}
+  - {fileID: 7755063153901822474}
+  - {fileID: 105685565816049142}
+  - {fileID: 3814190307106496192}
+  - {fileID: 431787504733871960}
+  - {fileID: 1649823919967249636}
+  - {fileID: 7416387727997859106}
+  - {fileID: 8913697450959205694}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -257,11 +270,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5374795783619558291}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4160643369365326472}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 145, y: 638.0681}
+  m_AnchoredPosition: {x: 145, y: 344}
   m_SizeDelta: {x: 253, y: 80}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1194664571567221775
@@ -373,7 +386,7 @@ GameObject:
   - component: {fileID: 783049085354423036}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Btn_googledenglu
+  m_Name: Btn_BindGoogle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -393,11 +406,11 @@ RectTransform:
   m_Children:
   - {fileID: 762678937599311503}
   - {fileID: 1399216586695889818}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4160643369365326472}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 394.0681}
+  m_AnchoredPosition: {x: 0, y: 100}
   m_SizeDelta: {x: 276, y: 74}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2777807110611717871
@@ -618,11 +631,11 @@ RectTransform:
   - {fileID: 9146976113297518773}
   - {fileID: 117883595721264124}
   - {fileID: 3760533285055505916}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4160643369365326472}
   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: 8.1668625}
+  m_AnchoredPosition: {x: 0, y: 99.99999}
   m_SizeDelta: {x: 476.71, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1627876562902720563
@@ -1127,7 +1140,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5220\u9664\u8D26\u53F7"
+  m_Text: "\u7ED1\u5B9AGoogle"
 --- !u!1 &2321818779751378156
 GameObject:
   m_ObjectHideFlags: 0
@@ -1635,7 +1648,7 @@ GameObject:
   - component: {fileID: 3505351788308317489}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Btn_YinXiao (1)
+  m_Name: Btn_ID
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1655,11 +1668,11 @@ RectTransform:
   m_Children:
   - {fileID: 2002481585160100367}
   - {fileID: 2992885620383388598}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4160643369365326472}
   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: 208.16687}
+  m_AnchoredPosition: {x: 0, y: 300}
   m_SizeDelta: {x: 476.71, y: 64}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3505351788308317489
@@ -1739,11 +1752,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5288774451809782939}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4160643369365326472}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 505.06818}
+  m_AnchoredPosition: {x: 0, y: 211.00006}
   m_SizeDelta: {x: 276, y: 74}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &4241911780120012977
@@ -2242,11 +2255,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4160643369365326472}
   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: 208.16689}
+  m_AnchoredPosition: {x: 0, y: 300}
   m_SizeDelta: {x: 520, y: 64}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3353563393973874225
@@ -2534,11 +2547,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7757997644300843650}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4160643369365326472}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 394.0681}
+  m_AnchoredPosition: {x: 0, y: 100}
   m_SizeDelta: {x: 276, y: 74}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2754880386697749742
@@ -2667,11 +2680,11 @@ RectTransform:
   m_LocalScale: {x: 1.000384, y: 1.000384, z: 1.000384}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4160643369365326472}
   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: 108.16688}
+  m_AnchoredPosition: {x: 0, y: 200}
   m_SizeDelta: {x: 520, y: 64}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &599645696911128871
@@ -3221,11 +3234,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4160643369365326472}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -7.4744, y: 303.16687}
+  m_AnchoredPosition: {x: -7.4744, y: 395}
   m_SizeDelta: {x: 450.8513, y: 50.4935}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1336933346209753520
@@ -3461,11 +3474,11 @@ RectTransform:
   - {fileID: 6000720323446270783}
   - {fileID: 8000412695394759888}
   - {fileID: 3937004056586083553}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4160643369365326472}
   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: 108.16687}
+  m_AnchoredPosition: {x: 0, y: 200}
   m_SizeDelta: {x: 476.71, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8971062379388587983
@@ -3587,11 +3600,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4160643369365326472}
   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: 301.86688}
+  m_AnchoredPosition: {x: 0, y: 393.70007}
   m_SizeDelta: {x: 624, y: 64}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2876684358389961987
@@ -3756,11 +3769,11 @@ RectTransform:
   m_LocalScale: {x: 1.000384, y: 1.000384, z: 1.000384}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4160643369365326472}
   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: 8.166863}
+  m_AnchoredPosition: {x: 0, y: 99.99999}
   m_SizeDelta: {x: 520, y: 64}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5199067738474453679
@@ -4080,19 +4093,6 @@ RectTransform:
   m_Children:
   - {fileID: 2354120935780841372}
   - {fileID: 4160643369365326472}
-  - {fileID: 2595853774863234435}
-  - {fileID: 3335154821151865286}
-  - {fileID: 1775611361754384282}
-  - {fileID: 5355010681599763548}
-  - {fileID: 3463984699172484862}
-  - {fileID: 2829838969233991924}
-  - {fileID: 7755063153901822474}
-  - {fileID: 105685565816049142}
-  - {fileID: 3814190307106496192}
-  - {fileID: 431787504733871960}
-  - {fileID: 1649823919967249636}
-  - {fileID: 7416387727997859106}
-  - {fileID: 8913697450959205694}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -4168,6 +4168,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_BindGoogle
+    gameObject: {fileID: 783049085354423036}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_ID
+    gameObject: {fileID: 3505351788308317489}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!114 &3362496358548609416
 MonoBehaviour:

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -270,9 +270,11 @@ public class PlayerManager : Singleton<PlayerManager>
 
     public int GetDaoYouLevel(AccountFileInfo.DaoYouData daoYouData)
     {
+        HeroPowerUpConfig[] heroPowerUpConfigs = ConfigComponent.Instance.GetAll<HeroPowerUpConfig>();
         DaoyouModelConfig daoyouModelConfig = ConfigComponent.Instance.Get<DaoyouModelConfig>(daoYouData.id);
         int level = (int)(myHero.level.Value * daoyouModelConfig.growupRate * 0.01f);
         if (level < 1) level = 1;
+        if (level > heroPowerUpConfigs.Length) level = heroPowerUpConfigs.Length;
         return level;
     }
 

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanelData.cs

@@ -131,17 +131,6 @@ namespace Fort23.Mono
 	      return _AttributeRoot;
 	     }
 	   }
-	  private Transform _CameraRoot;
-	  public Transform CameraRoot
-	   {
-	   get{
-	      if (_CameraRoot == null)
-	       {
-	         _CameraRoot  = GetUIUnit<Transform>("CameraRoot"); 
-	       }
-	      return _CameraRoot;
-	     }
-	   }
 	  private Text _Text_TuPo;
 	  public Text Text_TuPo
 	   {

Assets/Scripts/GameUI/UI/SettingPanel/SettingPanel.cs

@@ -1,5 +1,6 @@
 using Core.Audio;
 using Fort23.Core;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -45,6 +46,12 @@ namespace Fort23.Mono
                 Toggle_YinYue.ChangeState(0);
             }
 
+#if Google
+            Btn_BindGoogle.gameObject.SetActive(true);
+#else
+            Btn_BindGoogle.gameObject.SetActive(false);
+#endif
+
             return base.AsyncInit(uiData);
         }
 
@@ -97,9 +104,15 @@ namespace Fort23.Mono
                     TipMessagePanel.OpenTipMessagePanel("上传失败！");
                 }
             });
+
+            Btn_ID.onClick.AddListener(() =>
+            {
+                GUIUtility.systemCopyBuffer = AccountFileInfo.Instance.playerData.playerId;
+                TipMessagePanel.OpenTipMessagePanel("已复制");
+            });
         }
 
-        public async static CTask OpenPanel( UILayer layer = UILayer.Top)
+        public async static CTask OpenPanel(UILayer layer = UILayer.Top)
         {
             await UIManager.Instance.LoadAndOpenPanel<SettingPanel>(null, layer, isShowBG: true);
         }

Assets/Scripts/GameUI/UI/SettingPanel/SettingPanelData.cs

@@ -129,6 +129,28 @@ namespace Fort23.Mono
 	      return _Btn_DownloadArchive;
 	     }
 	   }
+	  private Button _Btn_BindGoogle;
+	  public Button Btn_BindGoogle
+	   {
+	   get{
+	      if (_Btn_BindGoogle == null)
+	       {
+	         _Btn_BindGoogle  = GetUIUnit<Button>("Btn_BindGoogle"); 
+	       }
+	      return _Btn_BindGoogle;
+	     }
+	   }
+	  private Button _Btn_ID;
+	  public Button Btn_ID
+	   {
+	   get{
+	      if (_Btn_ID == null)
+	       {
+	         _Btn_ID  = GetUIUnit<Button>("Btn_ID"); 
+	       }
+	      return _Btn_ID;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidget.cs

@@ -82,7 +82,7 @@ namespace Fort23.Mono
         {
             if (summonData.isSummonSocre)
             {
-                TipMessagePanelType2.OpenTipMessagePanel("已经开启300抽挑战，不能进行单抽了");
+                TipMessagePanelType2.OpenTipMessagePanel("已经开启200抽挑战，不能进行单抽了");
                 return;
             }
 
@@ -94,7 +94,7 @@ namespace Fort23.Mono
 
             if (PlayerManager.Instance.serverTime < summonData.nextOneFreeTime)
             {
-                TipMessagePanelType2.OpenTipMessagePanel("还未到达免费时间！请稍好再试");
+                TipMessagePanelType2.OpenTipMessagePanel("还未到达免费时间！请稍后再试");
                 return;
             }