gdl_123 hai 2 meses
pai
achega
c2ad25aef3

+ 2 - 2
Assets/Content/Config/LanguagePackage_base.csv

@@ -1641,8 +1641,8 @@ BtnUnfollow,Unfollow
 BtnFollow,Follow
 BtnRemoveBlock,Unblock
 BtnOpen,Activate
-EnterText,Activate
-ShopDiscount,Click to enter chat content...
+EnterText,Click to enter chat content...
+ShopDiscount,{0}%off
 ShopSellwell,Must-buy
 ShopForeverBuy,Remaining purchases: {0}
 ShopDayBuy,Remaining purchases: {0}

+ 10 - 1
Assets/Content/Config/LocalizeTextureCfg_base.csv

@@ -616,4 +616,13 @@ ui_Img_Skillshow_SkillName04_pic,UISkillShow/Img_Skillshow_SkillName04,Assets/Co
 ui_Img_Skillshow_SkillName05_pic,UISkillShow/Img_Skillshow_SkillName05,Assets/Content/Icons,,0
 ui_img_banner_bg_pic,UIStarSign/img_banner_bg,Assets/Content/Raw_Art/UI,,0
 ui_img_banner_title_pic,UIStarSign/img_banner_title,Assets/Content/Raw_Art/UI,,0
-ui_text_title_turnwheel_cn_pic,UITurnWheel/text_title_turnwheel_cn,Assets/Content/Raw_Art/UI,,0
+ui_text_title_turnwheel_cn_pic,UITurnWheel/text_title_turnwheel_cn,Assets/Content/Raw_Art/UI,,0
+ui_img_start_cn_pic,UIMap/img_start_cn,Assets/Content/Raw_Art/UI,,0
+ui_ic_luckyegg_mvp_pic,UILuckyEgg/ic_luckyegg_mvp,Assets/Content/Raw_Art/UI,,0
+ui_label_luckyegg_rare_mvp_pic,UILuckyEgg/label_luckyegg_rare_mvp,Assets/Content/Raw_Art/UI,,0
+ui_txt_luckyegg_goldenegg_cn_pic,UILuckyEgg/txt_luckyegg_goldenegg_cn,Assets/Content/Raw_Art/UI,,0
+ui_txt_luckyegg_variegationegg_cn_pic,UILuckyEgg/txt_luckyegg_variegationegg_cn,Assets/Content/Raw_Art/UI,,0
+ui_frame_ic_contract_pic,FrameNew/frame_ic_contract,Assets/Content/Icons,,1
+ui_frame_ic_follow_pic,FrameNew/frame_ic_follow,Assets/Content/Icons,,1
+ui_frame_ic_follow_r_pic,FrameNew/frame_ic_follow_r,Assets/Content/Icons,,1
+ui_frame_ic_follow_s_pic,FrameNew/frame_ic_follow_s,Assets/Content/Icons,,1

+ 10 - 1
Assets/Content/Config/LocalizeTextureCfg_tw.csv

@@ -616,4 +616,13 @@ ui_Img_Skillshow_SkillName04_pic,UISkillShow_cn/Img_Skillshow_SkillName04,Assets
 ui_Img_Skillshow_SkillName05_pic,UISkillShow_cn/Img_Skillshow_SkillName05,Assets/Content/Icons,,0
 ui_img_banner_bg_pic,UIStarSign_cn/img_banner_bg,Assets/Content/Raw_Art/UI,,0
 ui_img_banner_title_pic,UIStarSign_cn/img_banner_title,Assets/Content/Raw_Art/UI,,0
-ui_text_title_turnwheel_cn_pic,UITurnWheel_cn/text_title_turnwheel_cn,Assets/Content/Raw_Art/UI,,0
+ui_text_title_turnwheel_cn_pic,UITurnWheel_cn/text_title_turnwheel_cn,Assets/Content/Raw_Art/UI,,0
+ui_img_start_cn_pic,UIMap_cn/img_start_cn,Assets/Content/Raw_Art/UI,,0
+ui_ic_luckyegg_mvp_pic,UILuckyEgg_cn/ic_luckyegg_mvp,Assets/Content/Raw_Art/UI,,0
+ui_label_luckyegg_rare_mvp_pic,UILuckyEgg_cn/label_luckyegg_rare_mvp,Assets/Content/Raw_Art/UI,,0
+ui_txt_luckyegg_goldenegg_cn_pic,UILuckyEgg_cn/txt_luckyegg_goldenegg_cn,Assets/Content/Raw_Art/UI,,0
+ui_txt_luckyegg_variegationegg_cn_pic,UILuckyEgg_cn/txt_luckyegg_variegationegg_cn,Assets/Content/Raw_Art/UI,,0
+ui_frame_ic_contract_pic,FrameNew_cn/frame_ic_contract,Assets/Content/Icons,,1
+ui_frame_ic_follow_pic,FrameNew_cn/frame_ic_follow,Assets/Content/Icons,,1
+ui_frame_ic_follow_r_pic,FrameNew_cn/frame_ic_follow_r,Assets/Content/Icons,,1
+ui_frame_ic_follow_s_pic,FrameNew_cn/frame_ic_follow_s,Assets/Content/Icons,,1

BIN=BIN
Assets/Content/Fonts/GWMSansThaiUI-Regular.ttf


+ 21 - 0
Assets/Content/Fonts/GWMSansThaiUI-Regular.ttf.meta

@@ -0,0 +1,21 @@
+fileFormatVersion: 2
+guid: 7711d7ba259f9084382130497023ae80
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontNames:
+  - GWM Sans Thai UI
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 43 - 0
Assets/Content/Fonts/GWMSansThaiUI-RegularSDF.asset


+ 8 - 0
Assets/Content/Fonts/GWMSansThaiUI-RegularSDF.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3dfafcdb7b9f1e44d9534ac5051abeaf
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 0
Assets/Content/Fonts/VAGRoundedStdRegularSDF.asset

@@ -33863,6 +33863,7 @@ MonoBehaviour:
   fallbackFontAssets: []
   m_FallbackFontAssetTable:
   - {fileID: 11400000, guid: fd9f1aacbffd1f946b8504c0d68de8c3, type: 2}
+  - {fileID: 11400000, guid: 3dfafcdb7b9f1e44d9534ac5051abeaf, type: 2}
   m_CreationSettings:
     sourceFontFileName: 
     sourceFontFileGUID: 90ed5292e87d8a64aac7038df97ece85

+ 67 - 22
Assets/Content/Prefabs/UI/Battle/FloatBuffText.prefab

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 339738954749151609}
   - component: {fileID: 923080477275643603}
   - component: {fileID: 1760711403657067396}
+  - component: {fileID: 8489993229344666402}
   m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
@@ -28,6 +29,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.8, y: 0.8, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9045048968468763346}
   m_RootOrder: 0
@@ -54,17 +56,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 239174524408048588}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: 0907f0d863a6d994190940d19b272a97, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -74,6 +76,20 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8489993229344666402
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 239174524408048588}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f6c12cef85f0f7a449b80fce287d155b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: Buff/text_buff_shield_cn
 --- !u!1 &3207377865948634559
 GameObject:
   m_ObjectHideFlags: 0
@@ -102,6 +118,7 @@ RectTransform:
   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:
   - {fileID: 3073439811373631814}
   m_Father: {fileID: 5288113587230899564}
@@ -114,7 +131,7 @@ RectTransform:
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!95 &141978028571416829
 Animator:
-  serializedVersion: 3
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -127,10 +144,12 @@ Animator:
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!114 &6265217694921854529
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -171,6 +190,7 @@ RectTransform:
   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:
   - {fileID: 8457802224000643996}
   - {fileID: 8874338467837240579}
@@ -225,6 +245,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.8, y: 0.8, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3073439811373631814}
   m_RootOrder: 2
@@ -251,17 +272,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 4742171099560295824}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 0.18431373, b: 0.1745283, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: 95bc6efacfe050e4796ee6fa5aed9c5c, type: 2}
     m_FontSize: 0
@@ -285,7 +306,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 4742171099560295824}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
@@ -316,6 +337,7 @@ RectTransform:
   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:
   - {fileID: 4774148610818404739}
   m_Father: {fileID: 0}
@@ -337,6 +359,7 @@ GameObject:
   - component: {fileID: 8874338467837240579}
   - component: {fileID: 5927424880289820737}
   - component: {fileID: 5927080348461298330}
+  - component: {fileID: 8633698337956189454}
   m_Layer: 5
   m_Name: DODGE
   m_TagString: Untagged
@@ -354,6 +377,7 @@ RectTransform:
   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: 3073439811373631814}
   m_RootOrder: 1
@@ -380,17 +404,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 6421691562609295678}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: 80aa4f9965cde4148aca0b1541c45387, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -400,6 +424,20 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8633698337956189454
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6421691562609295678}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f6c12cef85f0f7a449b80fce287d155b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: Buff/text_buff_dodge_cn
 --- !u!1 &7508798169658658541
 GameObject:
   m_ObjectHideFlags: 0
@@ -429,6 +467,7 @@ RectTransform:
   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:
   - {fileID: 339738954749151609}
   - {fileID: 3907809861115072639}
@@ -461,7 +500,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 7508798169658658541}
   m_Enabled: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
@@ -475,6 +514,9 @@ MonoBehaviour:
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!114 &6793572609375748703
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -484,7 +526,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 7508798169658658541}
   m_Enabled: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_HorizontalFit: 2
@@ -517,6 +559,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.9, y: 0.9, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3073439811373631814}
   m_RootOrder: 0
@@ -543,17 +586,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 8240563805499437380}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: e56a4393b1c9b1442bc7a55351cc7f10, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -563,6 +606,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &8491978516234779997
 GameObject:
   m_ObjectHideFlags: 0
@@ -593,6 +637,7 @@ RectTransform:
   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: 9045048968468763346}
   m_RootOrder: 1
@@ -619,17 +664,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 8491978516234779997}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 0.18358739, b: 0.17647058, a: 1}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: 90ed5292e87d8a64aac7038df97ece85, type: 3}
     m_FontSize: 60
@@ -653,7 +698,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 8491978516234779997}
   m_Enabled: 0
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
@@ -667,7 +712,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 8491978516234779997}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}

+ 108 - 26
Assets/Content/Prefabs/UI/GridViewItem/IconPetItem.prefab

@@ -65,6 +65,7 @@ MonoBehaviour:
   - UINode
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &305366318503222981
 GameObject:
@@ -134,6 +135,7 @@ MonoBehaviour:
   - UnityEngine.UI.Image
   values: 00000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &3696065497627303110
 MonoBehaviour:
@@ -177,6 +179,7 @@ GameObject:
   - component: {fileID: 8985056147908181368}
   - component: {fileID: 3748157750311962755}
   - component: {fileID: 8329453957962314568}
+  - component: {fileID: 8401017829769228061}
   m_Layer: 5
   m_Name: Relation
   m_TagString: Untagged
@@ -199,11 +202,11 @@ RectTransform:
   m_Father: {fileID: 70813078944487029}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 59.800003, y: 25.8}
-  m_SizeDelta: {x: 104, y: 60}
-  m_Pivot: {x: 0, y: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -54.199997}
+  m_SizeDelta: {x: 68, y: 60}
+  m_Pivot: {x: 1, y: 0}
 --- !u!222 &8985056147908181368
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -260,9 +263,24 @@ MonoBehaviour:
   - UnityEngine.CanvasRenderer
   - UnityEngine.UI.Image
   - UINode
-  values: 00000100
+  - UILocalizeTexture
+  values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
+--- !u!114 &8401017829769228061
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 564500793307950365}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f6c12cef85f0f7a449b80fce287d155b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: ui_frame_ic_follow_r_pic
 --- !u!1 &682493973128641107
 GameObject:
   m_ObjectHideFlags: 0
@@ -330,6 +348,7 @@ MonoBehaviour:
   - TMPro.TextMeshProUGUI
   values: 00000001
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &445950043481996956
 MonoBehaviour:
@@ -480,6 +499,7 @@ MonoBehaviour:
   - UnityEngine.UI.Image
   values: 00000001
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!222 &8006680782202414608
 CanvasRenderer:
@@ -587,6 +607,7 @@ MonoBehaviour:
   values: 00000001
   depObjs:
   - {fileID: 3869347910764335197}
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &6261158266217939191
 MonoBehaviour:
@@ -635,7 +656,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 32
+  m_fontSize: 31.25
   m_fontSizeBase: 40
   m_fontWeight: 400
   m_enableAutoSizing: 1
@@ -689,6 +710,7 @@ GameObject:
   - component: {fileID: 7036978075749422577}
   - component: {fileID: 6403421310186394479}
   - component: {fileID: 2245784236622168276}
+  - component: {fileID: 7901057046715731435}
   m_Layer: 5
   m_Name: Contract
   m_TagString: Untagged
@@ -711,11 +733,11 @@ RectTransform:
   m_Father: {fileID: 70813078944487029}
   m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 59.799995, y: 25.800003}
-  m_SizeDelta: {x: 104, y: 60}
-  m_Pivot: {x: 0, y: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -54.199997}
+  m_SizeDelta: {x: 68, y: 60}
+  m_Pivot: {x: 1, y: 0}
 --- !u!222 &7036978075749422577
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -772,9 +794,24 @@ MonoBehaviour:
   - UnityEngine.CanvasRenderer
   - UnityEngine.UI.Image
   - UINode
-  values: 00000100
+  - UILocalizeTexture
+  values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
+--- !u!114 &7901057046715731435
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1460947032020483740}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f6c12cef85f0f7a449b80fce287d155b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: ui_frame_ic_contract_pic
 --- !u!1 &1787855810098639442
 GameObject:
   m_ObjectHideFlags: 0
@@ -843,6 +880,7 @@ MonoBehaviour:
   - UINode
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2090565363814649291
 GameObject:
@@ -912,6 +950,7 @@ MonoBehaviour:
   - UINode
   values: 000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &2931865412399522507
 GameObject:
@@ -1087,6 +1126,7 @@ MonoBehaviour:
   values: 00000000
   depObjs:
   - {fileID: 7930857824065390664}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &3451990571950190139
 GameObject:
@@ -1337,6 +1377,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &4424485311530577415
 GameObject:
@@ -1439,6 +1480,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &4957750940404976892
 GameObject:
@@ -1452,6 +1494,7 @@ GameObject:
   - component: {fileID: 5653257954836797558}
   - component: {fileID: 2629427981913759330}
   - component: {fileID: 1560792405434894279}
+  - component: {fileID: 3344839447277641567}
   m_Layer: 5
   m_Name: Support
   m_TagString: Untagged
@@ -1474,11 +1517,11 @@ RectTransform:
   m_Father: {fileID: 70813078944487029}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 59.8, y: 25.800003}
-  m_SizeDelta: {x: 104, y: 60}
-  m_Pivot: {x: 0, y: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -54.199997}
+  m_SizeDelta: {x: 68, y: 60}
+  m_Pivot: {x: 1, y: 0}
 --- !u!222 &5653257954836797558
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1535,9 +1578,24 @@ MonoBehaviour:
   - UnityEngine.CanvasRenderer
   - UnityEngine.UI.Image
   - UINode
-  values: 00000100
+  - UILocalizeTexture
+  values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
+--- !u!114 &3344839447277641567
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4957750940404976892}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f6c12cef85f0f7a449b80fce287d155b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: ui_frame_ic_follow_s_pic
 --- !u!1 &5060969036170048807
 GameObject:
   m_ObjectHideFlags: 0
@@ -1638,6 +1696,7 @@ MonoBehaviour:
   - UnityEngine.UI.Button
   values: 0000010001
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &6816351857177833870
 MonoBehaviour:
@@ -1869,6 +1928,7 @@ MonoBehaviour:
   - UnityEngine.UI.LayoutElement
   values: 01000001
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &5445574989188391175
 GameObject:
@@ -1969,6 +2029,7 @@ MonoBehaviour:
   - UnityEngine.UI.Button
   values: 0000010001
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &2155988302171257899
 MonoBehaviour:
@@ -2113,6 +2174,7 @@ MonoBehaviour:
   - UnityEngine.UI.Button
   values: 0000010001
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &6867114131034278197
 MonoBehaviour:
@@ -2170,6 +2232,7 @@ GameObject:
   - component: {fileID: 1714096937991088691}
   - component: {fileID: 8761690347051955559}
   - component: {fileID: 6522186878041130425}
+  - component: {fileID: 5985028226089361967}
   m_Layer: 5
   m_Name: Battle
   m_TagString: Untagged
@@ -2192,11 +2255,11 @@ RectTransform:
   m_Father: {fileID: 70813078944487029}
   m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 59.799995, y: 25.800003}
-  m_SizeDelta: {x: 104, y: 60}
-  m_Pivot: {x: 0, y: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -54.199997}
+  m_SizeDelta: {x: 68, y: 60}
+  m_Pivot: {x: 1, y: 0}
 --- !u!222 &1714096937991088691
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2253,9 +2316,24 @@ MonoBehaviour:
   - UnityEngine.CanvasRenderer
   - UnityEngine.UI.Image
   - UINode
-  values: 00000100
+  - UILocalizeTexture
+  values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
+--- !u!114 &5985028226089361967
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5903178679452228827}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f6c12cef85f0f7a449b80fce287d155b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: ui_frame_ic_follow_pic
 --- !u!1 &5999745064347691057
 GameObject:
   m_ObjectHideFlags: 0
@@ -2323,6 +2401,7 @@ MonoBehaviour:
   - TMPro.TextMeshProUGUI
   values: 00000001
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &2141314817681531567
 MonoBehaviour:
@@ -2371,7 +2450,7 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 37.05
+  m_fontSize: 40
   m_fontSizeBase: 40
   m_fontWeight: 400
   m_enableAutoSizing: 1
@@ -2588,6 +2667,7 @@ MonoBehaviour:
   - UIEventTriggerListener
   values: 0000010001
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!114 &7800462001983747371
 MonoBehaviour:
@@ -2699,6 +2779,7 @@ MonoBehaviour:
   - UINode
   values: 00000100
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &7625505699885046190
 GameObject:
@@ -2760,6 +2841,7 @@ MonoBehaviour:
   - UnityEngine.UI.Image
   values: 00000001
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!222 &3348335446341557728
 CanvasRenderer:

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 132 - 153
Assets/Content/Prefabs/UI/UIActivity/LimitedGiftItem.prefab


+ 161 - 144
Assets/Content/Prefabs/UI/UIActivity/UIActivityBackGift.prefab

@@ -28,6 +28,7 @@ RectTransform:
   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: 8041353691939079949}
   m_RootOrder: 2
@@ -54,17 +55,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 483229565405232995}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 82ee4de5265fbc443887f594244e2167, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
@@ -74,6 +75,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &844558331336603509
 GameObject:
   m_ObjectHideFlags: 0
@@ -102,6 +104,7 @@ RectTransform:
   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:
   - {fileID: 3134261585090816920}
   - {fileID: 3151090880979479083}
@@ -115,7 +118,7 @@ RectTransform:
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!95 &941582135871038654
 Animator:
-  serializedVersion: 3
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -128,10 +131,12 @@ Animator:
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!114 &4486429110015351076
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -172,6 +177,7 @@ RectTransform:
   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: 3151090880979479083}
   m_RootOrder: 1
@@ -198,17 +204,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 1288330801487319876}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: b0148567302c202499e86cc183357194, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
@@ -218,6 +224,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &4018387708776819957
 GameObject:
   m_ObjectHideFlags: 0
@@ -244,6 +251,7 @@ RectTransform:
   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:
   - {fileID: 4100088124785731602}
   - {fileID: 4899073710409116595}
@@ -286,6 +294,7 @@ RectTransform:
   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: 8041353691939079949}
   m_RootOrder: 0
@@ -312,17 +321,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 4730846229854292970}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 4f044c849a2b25845b2739d47b58c64a, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
@@ -332,6 +341,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5139801213738711072
 GameObject:
   m_ObjectHideFlags: 0
@@ -344,6 +354,7 @@ GameObject:
   - component: {fileID: 8773444401297763155}
   - component: {fileID: 7397502906379417415}
   - component: {fileID: 6406062818093194231}
+  - component: {fileID: 5825266821076366615}
   m_Layer: 5
   m_Name: Banner
   m_TagString: Untagged
@@ -361,6 +372,7 @@ RectTransform:
   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: 3151090880979479083}
   m_RootOrder: 2
@@ -387,17 +399,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 5139801213738711072}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: 81a62a721dd413b47aa0f1cba4b18cf1, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -407,6 +419,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &6406062818093194231
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -425,9 +438,24 @@ MonoBehaviour:
   - UnityEngine.CanvasRenderer
   - UnityEngine.UI.Image
   - UINode
-  values: 00000000
+  - UILocalizeTexture
+  values: 0000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
+--- !u!114 &5825266821076366615
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5139801213738711072}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f6c12cef85f0f7a449b80fce287d155b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: ui_img_banner_kingback_cn_pic
 --- !u!1 &5185877690595201390
 GameObject:
   m_ObjectHideFlags: 0
@@ -457,6 +485,7 @@ RectTransform:
   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: 3151090880979479083}
   m_RootOrder: 0
@@ -483,17 +512,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 5185877690595201390}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: ffe75ef6b603b3b418876246baa95342, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
@@ -503,6 +532,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &4480393097318992205
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -512,7 +542,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5185877690595201390}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.25882354}
@@ -544,6 +574,7 @@ RectTransform:
   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:
   - {fileID: 459890423312920801}
   m_Father: {fileID: 0}
@@ -583,6 +614,7 @@ RectTransform:
   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: 8041353691939079949}
   m_RootOrder: 3
@@ -628,11 +660,11 @@ MonoBehaviour:
   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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_text: "\u514D\u8D39\u9886\u53D6"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
@@ -655,13 +687,12 @@ MonoBehaviour:
   m_fontColorGradientPreset: {fileID: 0}
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_outlineColor:
-    serializedVersion: 2
-    rgba: 4278190080
   m_fontSize: 48
   m_fontSizeBase: 50
   m_fontWeight: 400
@@ -669,7 +700,9 @@ MonoBehaviour:
   m_fontSizeMin: 20
   m_fontSizeMax: 48
   m_fontStyle: 0
-  m_textAlignment: 514
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
   m_lineSpacing: 0
@@ -679,10 +712,8 @@ MonoBehaviour:
   m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
-  m_firstOverflowCharacterIndex: -1
   m_linkedTextComponent: {fileID: 0}
-  m_isLinkedTextComponent: 0
-  m_isTextTruncated: 0
+  parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
@@ -690,40 +721,18 @@ MonoBehaviour:
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
-  m_ignoreRectMaskCulling: 0
-  m_ignoreCulling: 1
   m_horizontalMapping: 0
   m_verticalMapping: 0
   m_uvLineOffset: 0
   m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
   m_VertexBufferAutoSizeReduction: 1
-  m_firstVisibleCharacter: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
   m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_textInfo:
-    textComponent: {fileID: 6979045007979623573}
-    characterCount: 4
-    spriteCount: 0
-    spaceCount: 0
-    wordCount: 1
-    linkCount: 0
-    lineCount: 1
-    pageCount: 1
-    materialCount: 1
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_spriteAnimator: {fileID: 0}
   m_hasFontAssetChanged: 0
-  m_subTextObjects:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &8188631341170027790
@@ -754,6 +763,7 @@ RectTransform:
   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: 8041353691939079949}
   m_RootOrder: 1
@@ -780,17 +790,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 8188631341170027790}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 99b7c52ea1eac5745a40b00845514b71, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
@@ -800,6 +810,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &9123906915603886098
 GameObject:
   m_ObjectHideFlags: 0
@@ -830,6 +841,7 @@ RectTransform:
   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:
   - {fileID: 6375858858985157366}
   - {fileID: 8805912317293786152}
@@ -860,11 +872,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 9123906915603886098}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -874,25 +887,26 @@ MonoBehaviour:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
     m_HighlightedSprite: {fileID: 0}
     m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 0}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!114 &7240754840236770615
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -914,10 +928,11 @@ MonoBehaviour:
   - UnityEngine.Animator
   values: 0000010000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!95 &8873017006526074462
 Animator:
-  serializedVersion: 3
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -930,10 +945,12 @@ Animator:
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1001 &3898946320393755552
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -941,126 +958,126 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 459890423312920801}
     m_Modifications:
-    - target: {fileID: 8821889968076543513, guid: d9605824ba6e12743874fa89df27b0c5,
-        type: 3}
-      propertyPath: m_Name
-      value: Alpha
-      objectReference: {fileID: 0}
-    - target: {fileID: 8821889968076543513, guid: d9605824ba6e12743874fa89df27b0c5,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
+      propertyPath: m_Pivot.x
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
+      propertyPath: m_Pivot.y
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_LocalPosition.z
+      propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
+      propertyPath: m_AnchorMax.x
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
+      propertyPath: m_AnchorMax.y
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
+      propertyPath: m_AnchorMin.x
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
+      propertyPath: m_AnchorMin.y
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_RootOrder
+      propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
+      propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
+      propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
+      propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_AnchoredPosition.x
+      propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
+      propertyPath: m_LocalRotation.w
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 0
+      propertyPath: m_LocalRotation.x
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 0
+      propertyPath: m_LocalRotation.y
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
+      propertyPath: m_LocalRotation.z
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_AnchorMin.y
+      propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
+      propertyPath: m_AnchoredPosition.y
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2118087428938887224, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4523113879695301004, guid: d9605824ba6e12743874fa89df27b0c5,
         type: 3}
       propertyPath: m_Color.a
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8821889968076543513, guid: d9605824ba6e12743874fa89df27b0c5,
+        type: 3}
+      propertyPath: m_Name
+      value: Alpha
+      objectReference: {fileID: 0}
+    - target: {fileID: 8821889968076543513, guid: d9605824ba6e12743874fa89df27b0c5,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d9605824ba6e12743874fa89df27b0c5, type: 3}
 --- !u!224 &3134261585090816920 stripped
@@ -1081,109 +1098,114 @@ PrefabInstance:
       propertyPath: m_Name
       value: UIWindowWave
       objectReference: {fileID: 0}
+    - target: {fileID: 7150610167409636290, guid: 07c9ccf10793c9a489ed28006a744844,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
+      propertyPath: m_Pivot.x
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_LocalPosition.y
+      propertyPath: m_Pivot.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
+      propertyPath: m_RootOrder
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
+      propertyPath: m_AnchorMax.x
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
+      propertyPath: m_AnchorMax.y
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
+      propertyPath: m_AnchorMin.x
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
+      propertyPath: m_AnchorMin.y
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_RootOrder
-      value: 3
+      propertyPath: m_SizeDelta.x
+      value: -84
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
+      propertyPath: m_SizeDelta.y
+      value: 200
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
+      propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
+      propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_AnchoredPosition.x
+      propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 52
+      propertyPath: m_LocalRotation.w
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_SizeDelta.x
-      value: -84
+      propertyPath: m_LocalRotation.x
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 200
+      propertyPath: m_LocalRotation.y
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
+      propertyPath: m_LocalRotation.z
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_AnchorMin.y
+      propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 1
+      propertyPath: m_AnchoredPosition.y
+      value: 52
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_AnchorMax.y
+      propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7891311113810187545, guid: 07c9ccf10793c9a489ed28006a744844,
         type: 3}
-      propertyPath: m_Pivot.y
+      propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 9208703478725501316, guid: 07c9ccf10793c9a489ed28006a744844,
@@ -1191,11 +1213,6 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 95
       objectReference: {fileID: 0}
-    - target: {fileID: 7150610167409636290, guid: 07c9ccf10793c9a489ed28006a744844,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 07c9ccf10793c9a489ed28006a744844, type: 3}
 --- !u!224 &4532348441203271346 stripped

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 130 - 168
Assets/Content/Prefabs/UI/UIActivity/UIActivityHundredRechargeBT.prefab


+ 47 - 14
Assets/Content/Prefabs/UI/UIBigMap/PointStartItem.prefab

@@ -27,6 +27,7 @@ RectTransform:
   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:
   - {fileID: 8065144724279755053}
   - {fileID: 6947103915781700003}
@@ -79,6 +80,7 @@ RectTransform:
   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: 6947103915781700003}
   m_RootOrder: 0
@@ -105,17 +107,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 2071619769582551915}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: f87458db544358e499c0a4d1c3742c91, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -125,6 +127,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &2710700883926162898
 GameObject:
   m_ObjectHideFlags: 0
@@ -136,6 +139,7 @@ GameObject:
   - component: {fileID: 7880109785643844850}
   - component: {fileID: 2638241890100372570}
   - component: {fileID: 6255590722756621233}
+  - component: {fileID: 7735724593812830427}
   m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
@@ -153,6 +157,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6947103915781700003}
   m_RootOrder: 1
@@ -179,17 +184,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 2710700883926162898}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: 458481cc6e2ef3b448ce6ff76a39dcea, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -199,6 +204,20 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7735724593812830427
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2710700883926162898}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f6c12cef85f0f7a449b80fce287d155b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: ui_img_start_cn_pic
 --- !u!1 &4382850375745103212
 GameObject:
   m_ObjectHideFlags: 0
@@ -227,6 +246,7 @@ RectTransform:
   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:
   - {fileID: 5314518218343286902}
   m_Father: {fileID: 0}
@@ -256,9 +276,11 @@ MonoBehaviour:
   - UnityEngine.Animator
   values: 000000
   depObjs: []
+  IsNewNode: 0
+  activeType: 0
 --- !u!95 &4872324746744839159
 Animator:
-  serializedVersion: 3
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -271,10 +293,12 @@ Animator:
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &6053277766044142588
 GameObject:
   m_ObjectHideFlags: 0
@@ -301,6 +325,7 @@ RectTransform:
   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:
   - {fileID: 214571543729383864}
   - {fileID: 7880109785643844850}
@@ -342,6 +367,7 @@ RectTransform:
   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: 5314518218343286902}
   m_RootOrder: 2
@@ -368,11 +394,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 7841150267517616056}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -382,25 +409,26 @@ MonoBehaviour:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
     m_HighlightedSprite: {fileID: 0}
     m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 537982030189650650}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!114 &537982030189650650
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -416,6 +444,7 @@ MonoBehaviour:
   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}
 --- !u!114 &8801770015816540428
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -437,6 +466,8 @@ MonoBehaviour:
   - UINode
   values: 0000010000
   depObjs: []
+  IsNewNode: 0
+  activeType: 0
 --- !u!1 &8836653764806829518
 GameObject:
   m_ObjectHideFlags: 0
@@ -465,6 +496,7 @@ RectTransform:
   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: 5314518218343286902}
   m_RootOrder: 0
@@ -491,17 +523,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 8836653764806829518}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.17254902, g: 0.22745098, b: 0.34117648, a: 0.47058824}
   m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: 0b5d8e9253ab3a74591d053350a1ed50, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -511,3 +543,4 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 131 - 101
Assets/Content/Prefabs/UI/UILuckyEgg/UILuckyEgg.prefab


+ 161 - 147
Assets/Content/Prefabs/UI/UILuckyEgg/UILuckyEggItem.prefab

@@ -29,6 +29,7 @@ RectTransform:
   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: 4381962645387899462}
   m_RootOrder: 0
@@ -55,17 +56,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 506810198877675014}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 923f8cb188ff03f45b8d803e5b294826, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -75,6 +76,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &8517795910252012779
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -84,7 +86,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 506810198877675014}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.3137255}
@@ -119,6 +121,7 @@ RectTransform:
   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: 8967852985427166012}
   m_RootOrder: 0
@@ -145,17 +148,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 1111667381773182421}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 5330dc9bae9732f419709da484640b82, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -165,6 +168,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &7639371941767799173
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -186,6 +190,7 @@ MonoBehaviour:
   values: 00000001
   depObjs:
   - {fileID: 0}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &1321223806436818328
 GameObject:
@@ -218,6 +223,7 @@ RectTransform:
   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:
   - {fileID: 4693912601459260575}
   - {fileID: 8967852985427166012}
@@ -253,6 +259,7 @@ MonoBehaviour:
   - SuperScrollView.LoopListViewItem
   values: 010000000000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!225 &2481660656817112348
 CanvasGroup:
@@ -275,7 +282,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1321223806436818328}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
@@ -341,6 +348,7 @@ RectTransform:
   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: 8967852985427166012}
   m_RootOrder: 4
@@ -367,17 +375,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 2072296653399580627}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.9704772, g: 1, b: 0.3726415, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 8ddac212d2119124eb639c95176f21c6, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -387,6 +395,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &2684886087144384638
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -428,6 +437,7 @@ RectTransform:
   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: 8967852985427166012}
   m_RootOrder: 1
@@ -454,17 +464,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 2599893576993956193}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 0.93470955, b: 0, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 8ddac212d2119124eb639c95176f21c6, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -474,6 +484,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &3042078404986451268
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -515,6 +526,7 @@ RectTransform:
   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: 8967852985427166012}
   m_RootOrder: 3
@@ -541,17 +553,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 3460221276401001707}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.95270276, g: 1, b: 0, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 8ddac212d2119124eb639c95176f21c6, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -561,6 +573,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &1517802720396928763
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -602,6 +615,7 @@ RectTransform:
   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: 8967852985427166012}
   m_RootOrder: 7
@@ -628,17 +642,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 3467690312517285430}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.95270276, g: 1, b: 0, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 8ddac212d2119124eb639c95176f21c6, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -648,6 +662,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &2537050711183408582
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -689,6 +704,7 @@ RectTransform:
   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: 8967852985427166012}
   m_RootOrder: 2
@@ -715,17 +731,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 3997795282601028241}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.95270276, g: 1, b: 0, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 8ddac212d2119124eb639c95176f21c6, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -735,6 +751,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &8766342769479339479
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -776,6 +793,7 @@ RectTransform:
   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: 8104232153023903364}
   m_RootOrder: 2
@@ -821,11 +839,11 @@ MonoBehaviour:
   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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_text: "\u5927\u5956\u9884\u89C8"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: ff9a33292f9ee2e4bb6b5beaa43eb505, type: 2}
@@ -848,13 +866,12 @@ MonoBehaviour:
   m_fontColorGradientPreset: {fileID: 0}
   m_spriteAsset: {fileID: 0}
   m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: 0
   m_overrideHtmlColors: 0
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_outlineColor:
-    serializedVersion: 2
-    rgba: 4278190080
   m_fontSize: 32
   m_fontSizeBase: 32
   m_fontWeight: 400
@@ -862,6 +879,8 @@ MonoBehaviour:
   m_fontSizeMin: 4
   m_fontSizeMax: 32
   m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 256
   m_textAlignment: 514
   m_characterSpacing: 0
   m_wordSpacing: 0
@@ -872,10 +891,8 @@ MonoBehaviour:
   m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
-  m_firstOverflowCharacterIndex: -1
   m_linkedTextComponent: {fileID: 0}
-  m_isLinkedTextComponent: 0
-  m_isTextTruncated: 0
+  parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
@@ -883,40 +900,18 @@ MonoBehaviour:
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
-  m_ignoreRectMaskCulling: 0
-  m_ignoreCulling: 1
   m_horizontalMapping: 0
   m_verticalMapping: 0
   m_uvLineOffset: 0
   m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
   m_VertexBufferAutoSizeReduction: 1
-  m_firstVisibleCharacter: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
   m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_textInfo:
-    textComponent: {fileID: 8849532963674495922}
-    characterCount: 4
-    spriteCount: 0
-    spaceCount: 0
-    wordCount: 1
-    linkCount: 0
-    lineCount: 1
-    pageCount: 1
-    materialCount: 1
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_spriteAnimator: {fileID: 0}
   m_hasFontAssetChanged: 0
-  m_subTextObjects:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &5461134836240992686
@@ -947,6 +942,7 @@ RectTransform:
   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: 8104232153023903364}
   m_RootOrder: 0
@@ -973,17 +969,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 5461134836240992686}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 2650f0899e9e20a49824d9a5a73b4824, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -993,6 +989,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5803685898318099692
 GameObject:
   m_ObjectHideFlags: 0
@@ -1022,6 +1019,7 @@ RectTransform:
   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: 8967852985427166012}
   m_RootOrder: 6
@@ -1048,17 +1046,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 5803685898318099692}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.95270276, g: 1, b: 0, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 8ddac212d2119124eb639c95176f21c6, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -1068,6 +1066,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &1271338367448477434
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1108,6 +1107,7 @@ RectTransform:
   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: 8104232153023903364}
   m_RootOrder: 1
@@ -1134,17 +1134,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 6136654516169158966}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: ef7b21985173bc6459160fcbaef6f152, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
@@ -1154,6 +1154,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &6405481595205085460
 GameObject:
   m_ObjectHideFlags: 0
@@ -1181,6 +1182,7 @@ RectTransform:
   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:
   - {fileID: 1557773120702001043}
   - {fileID: 2807534544719916528}
@@ -1210,6 +1212,7 @@ MonoBehaviour:
   - UINode
   values: 0000
   depObjs: []
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &7380316367825943852
 GameObject:
@@ -1239,6 +1242,7 @@ RectTransform:
   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: 4156732555740028322}
   m_RootOrder: 0
@@ -1265,17 +1269,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 7380316367825943852}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 0.11764706}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: 527de216b3e1d2a43af83d52ff98af28, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
@@ -1285,6 +1289,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &8330690534151652377
 GameObject:
   m_ObjectHideFlags: 0
@@ -1314,6 +1319,7 @@ RectTransform:
   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:
   - {fileID: 6582224076480404095}
   - {fileID: 1197994587409999791}
@@ -1335,11 +1341,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 8330690534151652377}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
     m_Mode: 3
+    m_WrapAround: 0
     m_SelectOnUp: {fileID: 0}
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
@@ -1349,28 +1356,29 @@ MonoBehaviour:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
     m_HighlightedSprite: {fileID: 0}
     m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
     m_DisabledSprite: {fileID: 0}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
     m_PressedTrigger: Pressed
+    m_SelectedTrigger: Highlighted
     m_DisabledTrigger: Disabled
   m_Interactable: 1
   m_TargetGraphic: {fileID: 0}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!95 &6905386827632657584
 Animator:
-  serializedVersion: 3
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -1383,10 +1391,12 @@ Animator:
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!114 &8151861644411072357
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1408,6 +1418,7 @@ MonoBehaviour:
   values: 00010000
   depObjs:
   - {fileID: 1771475236829798976}
+  IsNewNode: 0
   activeType: 0
 --- !u!1 &8948774550446046415
 GameObject:
@@ -1438,6 +1449,7 @@ RectTransform:
   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: 8967852985427166012}
   m_RootOrder: 5
@@ -1464,17 +1476,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 8948774550446046415}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.95270276, g: 1, b: 0, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 21300000, guid: 8ddac212d2119124eb639c95176f21c6, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -1484,6 +1496,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &9202014987247710162
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1523,6 +1536,7 @@ RectTransform:
   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:
   - {fileID: 513699326270958307}
   - {fileID: 3140340931532100829}
@@ -1563,85 +1577,76 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4156732555740028322}
     m_Modifications:
-    - target: {fileID: 5739433328070334643, guid: 1d46666fa0d895f40b80939ca3140baa,
-        type: 3}
-      propertyPath: m_Name
-      value: ExtraRewardItem
-      objectReference: {fileID: 0}
-    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 1467280358658259129, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_LocalPosition.x
+      propertyPath: m_AnchorMax.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 1467280358658259129, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_LocalPosition.y
+      propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 1720430718066525466, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_LocalPosition.z
+      propertyPath: m_AnchorMax.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 1720430718066525466, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_LocalRotation.x
+      propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 1720430718066525466, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_LocalRotation.y
+      propertyPath: m_AnchorMin.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 2201310818863747294, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
+      propertyPath: m_Text
+      value: "\u5927\u5956\u8FDB\u5EA6"
       objectReference: {fileID: 0}
-    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 2663194829528515973, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
+      propertyPath: m_SizeDelta.x
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 3542795572015927117, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_RootOrder
+      propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 3651236723661552231, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: cd918b6e39f93a34db1d82bdcbe550da,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
+      propertyPath: m_Pivot.x
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
+      propertyPath: m_Pivot.y
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
+      propertyPath: m_RootOrder
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 740
+      propertyPath: m_AnchorMax.x
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 80
+      propertyPath: m_AnchorMax.y
+      value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
@@ -1655,81 +1660,90 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0.5
+      propertyPath: m_SizeDelta.x
+      value: 740
       objectReference: {fileID: 0}
     - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0.5
+      propertyPath: m_SizeDelta.y
+      value: 80
       objectReference: {fileID: 0}
     - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
+      propertyPath: m_LocalPosition.x
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
+      propertyPath: m_LocalPosition.y
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 2663194829528515973, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_SizeDelta.x
+      propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3542795572015927117, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_IsActive
+      propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 2201310818863747294, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_Text
-      value: "\u5927\u5956\u8FDB\u5EA6"
+      propertyPath: m_LocalRotation.x
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1467280358658259129, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_AnchorMax.x
+      propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1467280358658259129, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_AnchorMax.y
+      propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1720430718066525466, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_AnchorMin.x
+      propertyPath: m_AnchoredPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1720430718066525466, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_AnchorMax.x
+      propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 1720430718066525466, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_AnchorMax.y
+      propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8663438452721055840, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_key
-      value: DscLuckyEggRewards
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3651236723661552231, guid: 1d46666fa0d895f40b80939ca3140baa,
+    - target: {fileID: 4303738140050923037, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 21300000, guid: cd918b6e39f93a34db1d82bdcbe550da,
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5739433328070334643, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
+      propertyPath: m_Name
+      value: ExtraRewardItem
+      objectReference: {fileID: 0}
     - target: {fileID: 8461552105099747499, guid: 1d46666fa0d895f40b80939ca3140baa,
         type: 3}
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 21300000, guid: f4be01a721783dc47820edd3c49292d0,
         type: 3}
+    - target: {fileID: 8663438452721055840, guid: 1d46666fa0d895f40b80939ca3140baa,
+        type: 3}
+      propertyPath: m_key
+      value: DscLuckyEggRewards
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1d46666fa0d895f40b80939ca3140baa, type: 3}
 --- !u!224 &2807534544719916528 stripped

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 136 - 138
Assets/Content/Prefabs/UI/UILuckyEgg/UILuckyEggResult.prefab


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 146 - 93
Assets/Content/Prefabs/UI/UILuckyEgg/UILuckyEggShow.prefab


+ 5 - 2
Assets/Editor/CsvToLua/luaCopyFileCfg.lua

@@ -1284,8 +1284,8 @@ luaCopyFileCfg.FileCfg ={
 luaCopyFileCfg.AddlocaizedCfg = 
 {
     --{'Buff','UIFunOpen','UIClub','UIActivity','UICollect','Items','UIVoyage','UICreateRole','UINewStory','UIBattleResult','UISkillShow'},
-    --'UITurnWheel','UIStarSign'
-    paths={'UITurnWheel','UIStarSign'},
+    --'UITurnWheel','UIStarSign','UIMap','UILuckyEgg','FrameNew'
+    paths={'FrameNew'},
     addCfg = {
         ['Buff']= {ex = ".png",Namer= "",basepath = "Assets/Content/Icons",other = "",setN = "0"},
         ['UIFunOpen']={ex = ".png",Namer= "",basepath = "Assets/Content/Icons",other = "",setN = "0"},
@@ -1300,6 +1300,9 @@ luaCopyFileCfg.AddlocaizedCfg =
         ['UISkillShow']={ex = ".png",Namer= "ui_%s_pic",basepath = "Assets/Content/Icons",other = "",setN = "0"},
         ['UIStarSign']={ex = ".png",Namer= "ui_%s_pic",basepath = "Assets/Content/Raw_Art/UI",other = "",setN = "0"},
         ['UITurnWheel']={ex = ".png",Namer= "ui_%s_pic",basepath = "Assets/Content/Raw_Art/UI",other = "",setN = "0"},
+        ['UIMap']={ex = ".png",Namer= "ui_%s_pic",basepath = "Assets/Content/Raw_Art/UI",other = "",setN = "0"},
+        ['UILuckyEgg']={ex = ".png",Namer= "ui_%s_pic",basepath = "Assets/Content/Raw_Art/UI",other = "",setN = "0"},
+        ['FrameNew']={ex = ".png",Namer= "ui_%s_pic",basepath = "Assets/Content/Icons",other = "",setN = "0"},
     }
 }
 

+ 2 - 2
Assets/Lua/UI/UIRuneShop/UIBoliShopView.lua

@@ -248,8 +248,8 @@ function UIBoliShopView:GetGoodsItemByRowColumn(gridView, itemIndex, row, column
                 or ManagerContainer.LuaGameMgr.CurLangKey == "_tw") then
 					discountNum = 100 - goodsData.disPercent
         else
-            --discountNum = goodsData.disPercent * 0.1
-			discountNum = 100 - goodsData.disPercent
+            discountNum = goodsData.disPercent * 0.1
+			--discountNum = 100 - goodsData.disPercent
         end
         itemLua.discount.text.text.text = I18N.SetLanguageValue("ShopDiscount", tostring(discountNum))	-- {0}折,中文是:{0}折,非中文是{0}%off
 		itemLua.originalPrice.number.text.text = goodsData.price

+ 2 - 2
Assets/Lua/UI/UIShop/UIShopView.lua

@@ -565,8 +565,8 @@ function UIShopView:GetShopGoodsItemByRowColumn(gridView, itemIndex, row, column
                 or ManagerContainer.LuaGameMgr.CurLangKey == "_tw") then
 					discountNum = 100 - goodsData.disPercent
         else
-            --discountNum = goodsData.disPercent * 0.1
-			discountNum = 100 - goodsData.disPercent
+            discountNum = goodsData.disPercent * 0.1
+			--discountNum = 100 - goodsData.disPercent
         end
         itemLua.discount.text.text.text = I18N.SetLanguageValue("ShopDiscount", tostring(discountNum))	-- {0}折,中文是:{0}折,非中文是{0}%off
 		itemLua.originalPrice.number.text.text = goodsData.price

+ 12 - 3
Build/NewCfg/LocalizedTextureCfg.csv

@@ -613,6 +613,15 @@ ui_Img_Skillshow_SkillName02_pic,UISkillShow/Img_Skillshow_SkillName02,Assets/Co
 ui_Img_Skillshow_SkillName03_pic,UISkillShow/Img_Skillshow_SkillName03,Assets/Content/Icons,,0
 ui_Img_Skillshow_SkillName04_pic,UISkillShow/Img_Skillshow_SkillName04,Assets/Content/Icons,,0
 ui_Img_Skillshow_SkillName05_pic,UISkillShow/Img_Skillshow_SkillName05,Assets/Content/Icons,,0
-ui_img_banner_bg_pic,UIStarSign_cn/img_banner_bg,Assets/Content/Raw_Art/UI,,0
-ui_img_banner_title_pic,UIStarSign_cn/img_banner_title,Assets/Content/Raw_Art/UI,,0
-ui_text_title_turnwheel_cn_pic,UITurnWheel_cn/text_title_turnwheel_cn,Assets/Content/Raw_Art/UI,,0
+ui_img_banner_bg_pic,UIStarSign/img_banner_bg,Assets/Content/Raw_Art/UI,,0
+ui_img_banner_title_pic,UIStarSign/img_banner_title,Assets/Content/Raw_Art/UI,,0
+ui_text_title_turnwheel_cn_pic,UITurnWheel/text_title_turnwheel_cn,Assets/Content/Raw_Art/UI,,0
+ui_img_start_cn_pic,UIMap/img_start_cn,Assets/Content/Raw_Art/UI,,0
+ui_ic_luckyegg_mvp_pic,UILuckyEgg/ic_luckyegg_mvp,Assets/Content/Raw_Art/UI,,0
+ui_label_luckyegg_rare_mvp_pic,UILuckyEgg/label_luckyegg_rare_mvp,Assets/Content/Raw_Art/UI,,0
+ui_txt_luckyegg_goldenegg_cn_pic,UILuckyEgg/txt_luckyegg_goldenegg_cn,Assets/Content/Raw_Art/UI,,0
+ui_txt_luckyegg_variegationegg_cn_pic,UILuckyEgg/txt_luckyegg_variegationegg_cn,Assets/Content/Raw_Art/UI,,0
+ui_frame_ic_contract_pic,FrameNew_cn/frame_ic_contract,Assets/Content/Icons,,0
+ui_frame_ic_follow_pic,FrameNew_cn/frame_ic_follow,Assets/Content/Icons,,0
+ui_frame_ic_follow_r_pic,FrameNew_cn/frame_ic_follow_r,Assets/Content/Icons,,0
+ui_frame_ic_follow_s_pic,FrameNew_cn/frame_ic_follow_s,Assets/Content/Icons,,0

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio