Merge branch 'master_xma_local' into master_xma_test

2020-11-03 19:24:35 +08:00 · 2020-11-03 19:24:35 +08:00 · 04e3f5adca
parent 8c228f8de6 3ae4ed1d41
commit 04e3f5adca
18 changed files with 883 additions and 74 deletions
--- a/Assets/ManagedResources/Icon/Item/r_privilege_yushou.png
+++ b/Assets/ManagedResources/Icon/Item/r_privilege_yushou.png
--- a/Assets/ManagedResources/Icon/Item/r_privilege_yushou.png.meta
+++ b/Assets/ManagedResources/Icon/Item/r_privilege_yushou.png.meta
@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 217158c664bab4244be38e7491536b23
+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: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - 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: 95ce14e2db1acdb4fb8a2d9e52869541
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab
@ -2033,6 +2033,45 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: 99
+--- !u!1 &85263308801493036
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9022903114754473043}
+  m_Layer: 5
+  m_Name: tip6
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &9022903114754473043
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 85263308801493036}
+  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: 1680603576330929297}
+  - {fileID: 5775386867918553622}
+  - {fileID: 2802655013472215758}
+  - {fileID: 4285736204395150642}
+  m_Father: {fileID: 7330114017493364820}
+  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: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &159660894273106650
 GameObject:
  m_ObjectHideFlags: 0
@ -3007,6 +3046,86 @@ MonoBehaviour:
  m_FillClockwise: 1
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
+--- !u!1 &627989894744980066
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6377300060762744271}
+  - component: {fileID: 6619109510602088500}
+  - component: {fileID: 1856024430517050312}
+  m_Layer: 5
+  m_Name: Text (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6377300060762744271
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 627989894744980066}
+  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: 8910592334665866365}
+  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: -239.20001, y: -26}
+  m_SizeDelta: {x: 160, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6619109510602088500
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 627989894744980066}
+  m_CullTransparentMesh: 0
+--- !u!114 &1856024430517050312
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 627989894744980066}
+  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.20784315, g: 0.10588236, b: 0.039215688, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+    m_FontSize: 32
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5468\u9650\u8D2D\u4E00\u6B21\uFF01"
+  LanguageIndex: 11058
 --- !u!1 &646217690541330681
 GameObject:
  m_ObjectHideFlags: 0
@ -4040,6 +4159,80 @@ MonoBehaviour:
  m_FillClockwise: 1
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
+--- !u!1 &1382709468034852690
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4285736204395150642}
+  - component: {fileID: 1249217814083078772}
+  - component: {fileID: 4898950874188094973}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4285736204395150642
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1382709468034852690}
+  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: 9022903114754473043}
+  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: -162, y: 21.9}
+  m_SizeDelta: {x: 145, y: 42}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1249217814083078772
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1382709468034852690}
+  m_CullTransparentMesh: 0
+--- !u!114 &4898950874188094973
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1382709468034852690}
+  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: 328daf85f5eadac498aac0236f98cea9, 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 &1387234809827108939
 GameObject:
  m_ObjectHideFlags: 0
@ -4233,6 +4426,7 @@ RectTransform:
  - {fileID: 299623428304022804}
  - {fileID: 2357585195622132797}
  - {fileID: 4146828295456914148}
+  - {fileID: 9022903114754473043}
  m_Father: {fileID: 8481690243604474688}
  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4278,6 +4472,86 @@ MonoBehaviour:
  m_FillClockwise: 1
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
+--- !u!1 &1520008648404239993
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2802655013472215758}
+  - component: {fileID: 7892783065471419495}
+  - component: {fileID: 6120465314861835844}
+  m_Layer: 5
+  m_Name: Text (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &2802655013472215758
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1520008648404239993}
+  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: 9022903114754473043}
+  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: -239.20001, y: -26}
+  m_SizeDelta: {x: 160, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7892783065471419495
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1520008648404239993}
+  m_CullTransparentMesh: 0
+--- !u!114 &6120465314861835844
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1520008648404239993}
+  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.20784315, g: 0.10588236, b: 0.039215688, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+    m_FontSize: 32
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5468\u9650\u8D2D\u4E00\u6B21\uFF01"
+  LanguageIndex: 11058
 --- !u!1 &1546231303818152366
 GameObject:
  m_ObjectHideFlags: 0
@ -6097,6 +6371,86 @@ MonoBehaviour:
    m_LineSpacing: 1
  m_Text: "\u5996"
  LanguageIndex: 11050
+--- !u!1 &2537794542672977747
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1680603576330929297}
+  - component: {fileID: 349604298173322382}
+  - component: {fileID: 5107691950965997253}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1680603576330929297
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2537794542672977747}
+  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: 9022903114754473043}
+  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.9, y: -1.62}
+  m_SizeDelta: {x: 636.2, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &349604298173322382
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2537794542672977747}
+  m_CullTransparentMesh: 0
+--- !u!114 &5107691950965997253
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2537794542672977747}
+  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.20784315, g: 0.10588236, b: 0.039215688, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+    m_FontSize: 32
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1.3
+  m_Text: "\u6BCF\u65E5\u53EF\u989D\u5916\u589E\u52A03\u6B21\u514D\u8D39\u7684\u7075\u517D\u5C71\u62DB\u52DF\u673A\u4F1A\uFF0C\u540C\u65F6\u7075\u517D\u5C71\u5996\u6676\u62DB\u52DF\u4EF7\u683C\u53D8\u4E3A8\u6298!"
+  LanguageIndex: 11056
 --- !u!1 &2555791581841976671
 GameObject:
  m_ObjectHideFlags: 0
@ -6298,6 +6652,7 @@ RectTransform:
  - {fileID: 1002276026712995389}
  - {fileID: 434959353339607873}
  - {fileID: 4852457502197335812}
+  - {fileID: 8910592334665866365}
  m_Father: {fileID: 1146278326}
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -7147,7 +7502,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0.000030517578, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &6954504526559241720
@ -10227,6 +10582,80 @@ MonoBehaviour:
  m_FillClockwise: 1
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
+--- !u!1 &5682421604983145720
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6571530064714753907}
+  - component: {fileID: 7840553487436301822}
+  - component: {fileID: 6410478700137765115}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6571530064714753907
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5682421604983145720}
+  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: 8910592334665866365}
+  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: -162, y: 21.9}
+  m_SizeDelta: {x: 145, y: 42}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7840553487436301822
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5682421604983145720}
+  m_CullTransparentMesh: 0
+--- !u!114 &6410478700137765115
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5682421604983145720}
+  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: 328daf85f5eadac498aac0236f98cea9, 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 &5744721822292471445
 GameObject:
  m_ObjectHideFlags: 0
@ -10340,6 +10769,86 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &6027977295019763191
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5775386867918553622}
+  - component: {fileID: 2350863945333293556}
+  - component: {fileID: 7658207808517224769}
+  m_Layer: 5
+  m_Name: Text (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &5775386867918553622
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6027977295019763191}
+  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: 9022903114754473043}
+  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: 5, y: 20.999994}
+  m_SizeDelta: {x: 160, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2350863945333293556
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6027977295019763191}
+  m_CullTransparentMesh: 0
+--- !u!114 &7658207808517224769
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6027977295019763191}
+  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.20784314, g: 0.105882354, b: 0.039215688, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+    m_FontSize: 32
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5FC5\u8D2D\u793C\u5305\uFF0C\u8D85\u503C\u4F18\u60E0\uFF0C\u6BCF"
+  LanguageIndex: 11057
 --- !u!1 &6043793511645728755
 GameObject:
  m_ObjectHideFlags: 0
@ -10958,6 +11467,86 @@ MonoBehaviour:
  m_FillClockwise: 1
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
+--- !u!1 &6478204121226763553
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2351597370401147964}
+  - component: {fileID: 4405978883840783523}
+  - component: {fileID: 5174415902496911920}
+  m_Layer: 5
+  m_Name: Text (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &2351597370401147964
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6478204121226763553}
+  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: 8910592334665866365}
+  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: 5, y: 20.999994}
+  m_SizeDelta: {x: 160, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4405978883840783523
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6478204121226763553}
+  m_CullTransparentMesh: 0
+--- !u!114 &5174415902496911920
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6478204121226763553}
+  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.20784314, g: 0.105882354, b: 0.039215688, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+    m_FontSize: 32
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5FC5\u8D2D\u793C\u5305\uFF0C\u8D85\u503C\u4F18\u60E0\uFF0C\u6BCF"
+  LanguageIndex: 11057
 --- !u!1 &6510926994779092942
 GameObject:
  m_ObjectHideFlags: 0
@ -11308,6 +11897,45 @@ MonoBehaviour:
  m_FillClockwise: 1
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
+--- !u!1 &7021476800658055817
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8910592334665866365}
+  m_Layer: 5
+  m_Name: tip6
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8910592334665866365
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7021476800658055817}
+  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: 6403305591341437904}
+  - {fileID: 2351597370401147964}
+  - {fileID: 6377300060762744271}
+  - {fileID: 6571530064714753907}
+  m_Father: {fileID: 3157604295042493341}
+  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: 48.888916, y: 311.11127}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7034551107073407428
 GameObject:
  m_ObjectHideFlags: 0
@ -13069,6 +13697,86 @@ Animator:
  m_HasTransformHierarchy: 1
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1 &8491038565068444751
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6403305591341437904}
+  - component: {fileID: 2083848079378776439}
+  - component: {fileID: 3011122342488982123}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6403305591341437904
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8491038565068444751}
+  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: 8910592334665866365}
+  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.9, y: -1.62}
+  m_SizeDelta: {x: 636.2, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2083848079378776439
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8491038565068444751}
+  m_CullTransparentMesh: 0
+--- !u!114 &3011122342488982123
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8491038565068444751}
+  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.20784315, g: 0.10588236, b: 0.039215688, 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
+    m_FontSize: 32
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1.3
+  m_Text: "\u6BCF\u65E5\u53EF\u989D\u5916\u589E\u52A03\u6B21\u514D\u8D39\u7684\u7075\u517D\u5C71\u62DB\u52DF\u673A\u4F1A\uFF0C\u540C\u65F6\u7075\u517D\u5C71\u5996\u6676\u62DB\u52DF\u4EF7\u683C\u53D8\u4E3A8\u6298!"
+  LanguageIndex: 11056
 --- !u!1 &8585186443393856776
 GameObject:
  m_ObjectHideFlags: 0
@ -13816,15 +14524,15 @@ PrefabInstance:
        type: 3}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 584f6c7286705c645ab8323012566269, type: 3}
--- !u!1 &3812896437756706176 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1342128629339684, guid: 584f6c7286705c645ab8323012566269,
-    type: 3}
-  m_PrefabInstance: {fileID: 3814238493100927908}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &4030831344110493642 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 224764860612850798, guid: 584f6c7286705c645ab8323012566269,
    type: 3}
  m_PrefabInstance: {fileID: 3814238493100927908}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &3812896437756706176 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1342128629339684, guid: 584f6c7286705c645ab8323012566269,
+    type: 3}
+  m_PrefabInstance: {fileID: 3814238493100927908}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab
@ -3768,7 +3768,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4009861031449356928}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3}
  m_Name: 
--- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonSummonOneResultPanel.prefab
@ -24470,11 +24470,11 @@ MonoBehaviour:
      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  m_FontData:
    m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
-    m_FontSize: 44
+    m_FontSize: 50
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 4
-    m_MaxSize: 45
+    m_MaxSize: 50
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
@ -35039,7 +35039,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.000012398, y: -0.00002034}
+  m_AnchoredPosition: {x: -1.2, y: 0.3}
  m_SizeDelta: {x: 69, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3178489416745694411
@ -35169,7 +35169,6 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 3569102849833951929}
-  - component: {fileID: 8233650449125365023}
  m_Layer: 5
  m_Name: Content3
  m_TagString: Untagged
@ -35199,26 +35198,3 @@ RectTransform:
  m_AnchoredPosition: {x: -1.9, y: 7}
  m_SizeDelta: {x: 255.2, y: 76.3}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8233650449125365023
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6974725393944192383}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 4
-  m_Spacing: 0
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
--- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
@ -147,7 +147,7 @@ RectTransform:
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {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}
@ -395,7 +395,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6630273786794472594
 RectTransform:
  m_ObjectHideFlags: 0
@ -1752,7 +1752,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7950070701309201066
 RectTransform:
  m_ObjectHideFlags: 0
@ -6858,7 +6858,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: -469.6, y: 808.1}
+  m_AnchoredPosition: {x: -395, y: 808.1}
  m_SizeDelta: {x: 110, y: 110}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3424048373273667453
@ -12180,7 +12180,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: 299, y: 462.5}
+  m_AnchoredPosition: {x: 299, y: 495}
  m_SizeDelta: {x: 160, y: 30}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5687762551274503171
@ -13907,7 +13907,7 @@ RectTransform:
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {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}
@ -14134,7 +14134,7 @@ RectTransform:
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {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}
--- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
@ -215,27 +215,30 @@ function BattleLogic.TurnRound(debugTurn)
            -- 上一轮结束
            BattleLogic.Event:DispatchEvent(BattleEventName.BattleRoundEnd, CurRound)
        end
-        CurRound = CurRound + 1
-        CurCamp = BattleLogic.FirstCamp -- 判断先手阵营
-        CurSkillPos[0] = 0
-        CurSkillPos[1] = 0
-        -- 
-        BattleLogManager.Log(
-            "Round Change",
-            "round", CurRound
-        )
-        -- 轮数变化
-        BattleLogic.Event:DispatchEvent(BattleEventName.BattleRoundChange, CurRound)
-        -- 开始 
-        BattleLogic.Event:DispatchEvent(BattleEventName.BattleRoundStart, CurRound)
-
-
        -- 检测一次灵兽技能
        SkillManager.CheckMonsterSkill(function()
-            --轮数变化后延时0.2秒用于初始化监听回合数被动的初始化
-            BattleLogic.WaitForTrigger(0.2,function()
-                -- 进入新轮
-                BattleLogic.CheckBattleLogic()
+            CurRound = CurRound + 1
+            CurCamp = BattleLogic.FirstCamp -- 判断先手阵营
+            CurSkillPos[0] = 0
+            CurSkillPos[1] = 0
+            -- 
+            BattleLogManager.Log(
+                "Round Change",
+                "round", CurRound
+            )
+            -- 轮数变化
+            BattleLogic.Event:DispatchEvent(BattleEventName.BattleRoundChange, CurRound)
+            -- 开始 
+            BattleLogic.Event:DispatchEvent(BattleEventName.BattleRoundStart, CurRound)
+
+
+            -- 检测一次灵兽技能
+            SkillManager.CheckMonsterSkill(function()
+                --轮数变化后延时0.2秒用于初始化监听回合数被动的初始化
+                BattleLogic.WaitForTrigger(0.2,function()
+                    -- 进入新轮
+                    BattleLogic.CheckBattleLogic()
+                end)
            end)
        end)
    else
--- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua
@ -96,11 +96,15 @@ end
 -- 检测是否需要等待灵兽技能
 function this.CheckMonsterSkill(func)
    this.MonsterCheckFunc = func
+    -- 判断是否可以向下执行
    if not this.IsSkilling and (not this.MonsterSkillList or #this.MonsterSkillList == 0) then
+        -- 
        if this.MonsterCheckFunc then
-            this.MonsterCheckFunc()
+            local func = this.MonsterCheckFunc
+            -- 置空方法放到回调之前，避免再会调中再次调用检测方法导致方法被删除
+            this.MonsterCheckFunc = nil
+            func()
        end
-        this.MonsterCheckFunc = nil
    end
 end

--- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
@ -42,7 +42,7 @@ function EnemyView:onCreate(go, role, position, root)
    self.spAtkTime = RoleConfig[role.roleData.roleId].CastingSkills/1000
    self.atkSoundTime = RoleConfig[role.roleData.roleId].CastingAudio/1000
    self.attackSound = RoleConfig[role.roleData.roleId].sond
-    self.readingName = HeroConfig[role.roleData.roleId].readingName
+    self.readingName = HeroConfig[role.roleData.roleId].ReadingName

    -- 
    self.nameText.text = self.readingName
--- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
@ -45,11 +45,11 @@ function PlayerView:onCreate(go, role, position, root)
    self.spAtkTime = RoleConfig[role.roleData.roleId].CastingSkills/1000
    self.atkSoundTime = RoleConfig[role.roleData.roleId].CastingAudio/1000
    self.attackSound = RoleConfig[role.roleData.roleId].sond
-    self.readingName = HeroConfig[role.roleData.roleId].readingName
+    self.readingName = HeroConfig[role.roleData.roleId].ReadingName

    self.nameText.text = self.readingName
    self.level.text = role:GetRoleData(RoleDataName.Level)
-    self.sprite = Util.LoadSprite(GetProStrImageByProNum(role.roleData.element))
+    self.elementImg.sprite = Util.LoadSprite(GetProStrImageByProNum(role.roleData.element))
    self.bg1.sprite = Util.LoadSprite(GetBattleHeroCardStarBg[role.roleData.star])
    self.bg2.sprite = Util.LoadSprite(GetHeroCardStarFg[role.roleData.star])
    local starGrid = Util.GetGameObject(go, "StarGrid")
--- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
+++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
@ -177,7 +177,7 @@ function this.UpdateHeroUpStarData(_curUpStarData)
            local go = needHeros[i + 1]
            go:SetActive(true)
            upStarConsumeMaterial[i]={}
-            upStarMaterialIsAll[i]=false
+            upStarMaterialIsAll[i]=2
            local proImage = Util.GetGameObject(go.transform, "iconbg/proImage")
            local iconDefault =  Util.GetGameObject(go.transform,"iconDefault")
            local icon = Util.GetGameObject(go.transform,"icon")
--- a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
@ -167,6 +167,10 @@ function PrivilegeManager.GetPrivilegeRemainValue(privilegeType)
    local usedTimes = this.GetPrivilegeUsedTimes(privilegeType)
    -- LogBlue(string.format("originalValue:%s, usedTimes:%s",tostring(originalValue),tostring(usedTimes)))
    local remainNum = originalValue - usedTimes
+    -- 剩余次数不会小于0，修正
+    if remainNum < 0 then
+        remainNum = 0
+    end
    return remainNum
 end

--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
@ -111,7 +111,7 @@ function PokemonSummonOneResultPanel:OnOpen(...)
    if isFree then
        this.itemNum3.gameObject:SetActive(false)
        this.itemIcon3.gameObject:SetActive(false)
-        this.itemInfo3.text=Language[12399]
+        this.itemInfo3.text="免费召唤"
        this.tipText.gameObject:SetActive(false)
    else
        this.itemNum3.gameObject:SetActive(true)
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
@ -129,7 +129,7 @@ function PokemonSummonPanel:refreshBtnShow()
        end
        local d = RecruitManager.GetExpendData(type)
        if isFree then
-            info.text=Language[11759]
+            info.text=" "..Language[11759]
        else
            itemId = d[1]
            itemNum = d[2]
--- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
@ -612,11 +612,13 @@ function GiftView:SetTipShow(tipRoot, data, buyType, DataTypeIndex)
        local tip3 = Util.GetGameObject(tipRoot,"tip3")
        local tip4 = Util.GetGameObject(tipRoot,"tip4")
        local tip5 = Util.GetGameObject(tipRoot,"tip5")
+        local tip6 = Util.GetGameObject(tipRoot,"tip6")
        tip1:SetActive(false)
        tip2:SetActive(false)
        tip3:SetActive(false)
        tip4:SetActive(false)
        tip5:SetActive(false)
+        tip6:SetActive(false)
        if DataTypeIndex == DataType.Shop then
            if data.id == 20091 then
                tip1:SetActive(true)
@ -630,6 +632,8 @@ function GiftView:SetTipShow(tipRoot, data, buyType, DataTypeIndex)
                tip4:SetActive(true)
            elseif data.goodsId == 4003 then
                tip5:SetActive(true)
+            elseif data.goodsId == 7105 then
+                tip6:SetActive(true)
            end
        end
    end
@ -729,6 +733,8 @@ function GiftView:SpecialTime(t)
        else
            if _min>=1 then
                return string.format(Language[11752], _min), _min
+            else
+                return "0分"
            end
        end
    end
--- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua
@ -141,10 +141,15 @@ function this.InitPreData()
            --判断品质
            if itemConfig[a.Reward[1]].Quantity == itemConfig[b.Reward[1]].Quantity then 
                --判断类型
-                if itemConfig[a.Reward[1]].ItemType<itemConfig[b.Reward[1]].Quantity then
-                    return a.Reward[1] > b.Reward[1]
+                if itemConfig[a.Reward[1]].ItemType==itemConfig[b.Reward[1]].ItemType then
+                    --判断id
+                    if a.Reward[1] == b.Reward[1] then
+                        return a.Reward[2] < b.Reward[2]
+                    else
+                        return a.Reward[1] < b.Reward[1]
+                    end                   
                else
-                    return a.Reward[1] < b.Reward[1]
+                    return itemConfig[a.Reward[1]].ItemType<itemConfig[b.Reward[1]].ItemType
                end
            else
                return itemConfig[a.Reward[1]].Quantity > itemConfig[b.Reward[1]].Quantity
--- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
@ -370,7 +370,7 @@ end
 -- 刷新商店物品列表排序
 function this.SortItemList(shopType)
    -- 试炼副本商店不按sort字段排序
-    -- if shopType == SHOP_TYPE.TRIAL_SHOP then return end--森罗商店上来就被🈲了，但是现在对森罗商店有了处理
+    -- if shopType == SHOP_TYPE.TRIAL_SHOP then return end--森罗商店上来就被禁了，但是现在对森罗商店有了处理
    -- 排序
    local shopData = nil
    for _, v in ipairs(this.allShopData) do
@ -1152,4 +1152,19 @@ function this.CheckNoviceGiftData()
 end


+-- 检测商店物品
+function this.CheckShopItemList(list)
+    local itemList = {}
+    for _, item in ipairs(list) do
+        local info = this.GetShopItemInfo(item.id)
+        if info.OpenLv and
+            info.OpenLv[1] and info.OpenLv[1] <= PlayerManager.level then 
+        --     info.OpenLv[2] and info.OpenLv[2] >= PlayerManager.level then
+                table.insert(itemList, item)
+        end
+    end
+    return itemList
+end
+
+
 return this
--- a/Assets/ManagedResources/~Lua/View/ShopView.lua
+++ b/Assets/ManagedResources/~Lua/View/ShopView.lua
@ -402,7 +402,7 @@ function this:RefreshItemList(isTop)
        -- 重置列表
        self.RechargeScrollView.gameObject:SetActive(false)
        self.ScrollView.gameObject:SetActive(true)
-        local itemlist = self.ShopData.storeItem
+        local itemlist = ShopManager.CheckShopItemList(self.ShopData.storeItem)
        self.ScrollView:SetData(itemlist, function(index, shopItem)
            local itemData = itemlist[index]
            self:ShopItemAdapter(shopItem, itemData)