Merge branch 'dev_20230815' of http://git.juzugame.com/b6-client/b6-unity into dev_20230815

Assets/Editor/BFBuildProjectTools/Utils/IOSLocalizationTool.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Newtonsoft.Json;
+using UnityEditor;
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+using UnityEngine;
+
+#if UNITY_IOS
+using UnityEditor.iOS.Xcode;
+#endif
+
+ public class IOSLocalizationTool
+{
+        public static readonly Dictionary<SystemLanguage, string> validLanguageMap = new Dictionary<SystemLanguage, string>()
+        {
+            [SystemLanguage.English] = "en",
+            [SystemLanguage.ChineseSimplified] = "zh_CN",
+            [SystemLanguage.ChineseTraditional] = "zh_TW",
+            [SystemLanguage.Japanese] = "ja",
+            [SystemLanguage.Korean] = "ko",
+            [SystemLanguage.Spanish] = "es",
+            [SystemLanguage.Vietnamese] = "vi",
+            [SystemLanguage.Thai] = "th",
+            [SystemLanguage.Indonesian] = "id",
+            [SystemLanguage.Portuguese] = "pt",
+        };
+
+        public static void SetLocalization(string pathToBuiltProject)
+        {
+#if UNITY_IOS
+            string buildPath = pathToBuiltProject;
+            const string infoPlistName = "Info.plist";
+            
+            var plistPath = Path.Combine(buildPath, infoPlistName);
+            PlistDocument plist = new PlistDocument();
+            plist.ReadFromFile(plistPath);
+            
+            // url schemes
+            const string bundleLocalizationKey = "CFBundleLocalizations";
+            
+            if (!plist.root.values.TryGetValue(bundleLocalizationKey, out var localizations))
+            {
+                localizations = plist.root.CreateArray(bundleLocalizationKey);
+            }
+
+            foreach (string value in validLanguageMap.Values)
+            {
+                localizations.AsArray().AddString(value);
+            }
+            
+            plist.WriteToFile(plistPath);
+
+            var projectPath = PBXProject.GetPBXProjectPath(buildPath);
+            var project = new PBXProject();
+            project.ReadFromFile(projectPath);
+            var target = project.GetUnityMainTargetGuid();
+            var resourceTarget = project.GetResourcesBuildPhaseByTarget(target);
+
+            foreach (string value in validLanguageMap.Values)
+            {
+                var path = Path.Combine(Path.Combine(Application.dataPath, "../", "BFVersions/ios/ios_common"), $"{value}.lproj");
+                var inProjectPath = Path.GetFileName(path);
+                project.AddFolderReference(path, inProjectPath);
+                var resGUID = project.FindFileGuidByProjectPath(inProjectPath);
+                project.AddFileToBuildSection(
+                    target,
+                    resourceTarget,
+                    resGUID);
+            }
+            
+            project.WriteToFile(projectPath);
+#endif
+    }
+}

Assets/Editor/BFBuildProjectTools/Utils/IOSLocalizationTool.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4be556fddd0e984428c0410a562496d8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/Package.cs

@@ -114,7 +114,8 @@ public class Package {
 
         // 编辑plist 文件
         EditorPlist(Path.GetFullPath(pathToBuiltProject));
-        CopyDirectory(Path.Combine(Application.dataPath, "../", "BFVersions/ios/ios_common"), Path.GetFullPath(pathToBuiltProject), true);
+        // CopyDirectory(Path.Combine(Application.dataPath, "../", "BFVersions/ios/ios_common"), Path.GetFullPath(pathToBuiltProject), true);
+        IOSLocalizationTool.SetLocalization(pathToBuiltProject);
     }
 
     static void CopyDirectory(string sourceDir, string destinationDir, bool recursive) {

Assets/prefabs/ui/battle/battle_ui.prefab

@@ -5023,6 +5023,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 766509631108997893}
+  - component: {fileID: 2035421727835303110}
+  - component: {fileID: 8342331650188781369}
   m_Layer: 5
   m_Name: battle_node
   m_TagString: Untagged
@@ -5050,6 +5052,40 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 918}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &2035421727835303110
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2716961016822480841}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &8342331650188781369
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2716961016822480841}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GroupOrder: 11
 --- !u!1 &2908987935824165984
 GameObject:
   m_ObjectHideFlags: 0
@@ -13899,6 +13935,7 @@ MonoBehaviour:
   - {fileID: 6491966633431553071}
   - {fileID: 3786921548234582467}
   - {fileID: 2170445370667621370}
+  - {fileID: 8342331650188781369}
   NotchScreenNodeList:
   - gameObject: {fileID: 822431826545976571}
     adjustHeight: 0
@@ -14515,16 +14552,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
---- !u!224 &4637104479082081270 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
-  m_PrefabInstance: {fileID: 63153399885659567}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4345343870430669859 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
   m_PrefabInstance: {fileID: 63153399885659567}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &4637104479082081270 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
+  m_PrefabInstance: {fileID: 63153399885659567}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &164396171060211616
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -14670,16 +14707,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
---- !u!224 &4823950210164062713 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
-  m_PrefabInstance: {fileID: 164396171060211616}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4532191219610058284 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
   m_PrefabInstance: {fileID: 164396171060211616}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &4823950210164062713 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
+  m_PrefabInstance: {fileID: 164396171060211616}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &311050968366903315
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -14888,16 +14925,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
---- !u!1 &7942625283249203436 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 352145542058850513}
-  m_PrefabAsset: {fileID: 0}
---- !u!224 &9134045761788230802 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 352145542058850513}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &2126919252421461927 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
@@ -14909,6 +14936,16 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &7942625283249203436 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 352145542058850513}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &9134045761788230802 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 352145542058850513}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &550390724268313014
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -15129,16 +15166,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ce2b9c61135cb754891c1af3abd6920c, type: 3}
---- !u!224 &4895953385856529162 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 5214448576181202089, guid: ce2b9c61135cb754891c1af3abd6920c, type: 3}
-  m_PrefabInstance: {fileID: 841217587773382563}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5074370152592619743 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 5604538647499745148, guid: ce2b9c61135cb754891c1af3abd6920c, type: 3}
   m_PrefabInstance: {fileID: 841217587773382563}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &4895953385856529162 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5214448576181202089, guid: ce2b9c61135cb754891c1af3abd6920c, type: 3}
+  m_PrefabInstance: {fileID: 841217587773382563}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &5340034205836671868 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: -4488111764086496033, guid: ce2b9c61135cb754891c1af3abd6920c, type: 3}
@@ -15974,16 +16011,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3}
---- !u!1 &3343385904249035928 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 792060148255419897, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3}
-  m_PrefabInstance: {fileID: 2637949698329948513}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &1132939814864582166 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 3108296850535892855, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3}
   m_PrefabInstance: {fileID: 2637949698329948513}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &3343385904249035928 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 792060148255419897, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3}
+  m_PrefabInstance: {fileID: 2637949698329948513}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2852916185352659568
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16085,11 +16122,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3}
---- !u!224 &8899478572343912982 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3}
-  m_PrefabInstance: {fileID: 2852916185352659568}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &8899478572343912983 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 6635725003137091687, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3}
@@ -16106,6 +16138,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!224 &8899478572343912982 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6635725003137091686, guid: 70aed71a2a41bc149b5c2c3a7d9b19cf, type: 3}
+  m_PrefabInstance: {fileID: 2852916185352659568}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2963387977643518837
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16207,16 +16244,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
---- !u!224 &5981243280832196406 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 2963387977643518837}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &4898470219173313352 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 2963387977643518837}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &3478844763786449923 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
@@ -16228,6 +16255,16 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &4898470219173313352 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 2963387977643518837}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &5981243280832196406 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 2963387977643518837}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3501028591294518496
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16539,16 +16576,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
---- !u!1 &1662807744014921144 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2700050507860828102, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
-  m_PrefabInstance: {fileID: 3633274003989164670}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &1303913756585297729 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2338377368704152895, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
   m_PrefabInstance: {fileID: 3633274003989164670}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1662807744014921144 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2700050507860828102, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
+  m_PrefabInstance: {fileID: 3633274003989164670}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3940425883890719359
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16658,16 +16695,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
---- !u!224 &5242845466737964140 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
-  m_PrefabInstance: {fileID: 3940425883890719359}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5576457938038633887 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 8920710045876662240, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
   m_PrefabInstance: {fileID: 3940425883890719359}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &5242845466737964140 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 9110043562113854995, guid: 1dcff29ab43a9e1428c119da472871a8, type: 3}
+  m_PrefabInstance: {fileID: 3940425883890719359}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3992249562554997052
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -17356,16 +17393,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
---- !u!1 &579086798807901299 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
-  m_PrefabInstance: {fileID: 4924741740405327352}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &1393040209864996846 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
   m_PrefabInstance: {fileID: 4924741740405327352}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &579086798807901299 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
+  m_PrefabInstance: {fileID: 4924741740405327352}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4946890495658564103
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -17467,11 +17504,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
---- !u!224 &4505664557021601348 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 4946890495658564103}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &3349604647357729338 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
@@ -17488,6 +17520,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!224 &4505664557021601348 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 4946890495658564103}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4966711823065719763
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -17799,16 +17836,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
---- !u!1 &727715708646881422 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
-  m_PrefabInstance: {fileID: 5064363141541419269}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &1244430852999932691 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
   m_PrefabInstance: {fileID: 5064363141541419269}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &727715708646881422 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
+  m_PrefabInstance: {fileID: 5064363141541419269}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5067496386916849509
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -17906,16 +17943,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
---- !u!224 &1251575361359160691 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
-  m_PrefabInstance: {fileID: 5067496386916849509}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &721204828226139886 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
   m_PrefabInstance: {fileID: 5067496386916849509}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &1251575361359160691 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
+  m_PrefabInstance: {fileID: 5067496386916849509}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5069615928325120856
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -19195,16 +19232,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
---- !u!1 &8567295588681957530 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2700050507860828102, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
-  m_PrefabInstance: {fileID: 6025152556865462108}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &8353668785482033763 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2338377368704152895, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
   m_PrefabInstance: {fileID: 6025152556865462108}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8567295588681957530 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2700050507860828102, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
+  m_PrefabInstance: {fileID: 6025152556865462108}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6281625263577488710
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -19457,16 +19494,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
---- !u!224 &59245342191656345 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
-  m_PrefabInstance: {fileID: 6331880097609330575}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1985592120918445572 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
   m_PrefabInstance: {fileID: 6331880097609330575}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &59245342191656345 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
+  m_PrefabInstance: {fileID: 6331880097609330575}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6341536710361824361
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -19719,16 +19756,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3}
---- !u!224 &1124281315851567344 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6124372206462679079, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3}
-  m_PrefabInstance: {fileID: 6585419292669032663}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &761437726962952713 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 5905679678307275486, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3}
   m_PrefabInstance: {fileID: 6585419292669032663}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &1124281315851567344 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6124372206462679079, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3}
+  m_PrefabInstance: {fileID: 6585419292669032663}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6794649544159706245
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -20088,16 +20125,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
---- !u!224 &2706240165845954244 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
-  m_PrefabInstance: {fileID: 7292576075314493597}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6456457455187257617 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
   m_PrefabInstance: {fileID: 7292576075314493597}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &2706240165845954244 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
+  m_PrefabInstance: {fileID: 7292576075314493597}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7297353101838581832
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -20199,16 +20236,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3}
---- !u!224 &6329628742520661660 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3}
-  m_PrefabInstance: {fileID: 7297353101838581832}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6329628742520661661 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 3644041249471915733, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3}
   m_PrefabInstance: {fileID: 7297353101838581832}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &6329628742520661660 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3}
+  m_PrefabInstance: {fileID: 7297353101838581832}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &71845994348189431 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: -1893103426573199681, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3}
@@ -20550,16 +20587,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
---- !u!1 &2454542461798596658 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
-  m_PrefabInstance: {fileID: 7944683686722036153}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &4128692060588397487 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
   m_PrefabInstance: {fileID: 7944683686722036153}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2454542461798596658 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
+  m_PrefabInstance: {fileID: 7944683686722036153}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8121589335013595971
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -20657,16 +20694,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
---- !u!1 &4387852515671030472 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
-  m_PrefabInstance: {fileID: 8121589335013595971}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &2862194028058159445 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
   m_PrefabInstance: {fileID: 8121589335013595971}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &4387852515671030472 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
+  m_PrefabInstance: {fileID: 8121589335013595971}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8223844726673718680
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -20871,16 +20908,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
---- !u!224 &2655772653335430345 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
-  m_PrefabInstance: {fileID: 8346879978074404575}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4577757258242840404 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
   m_PrefabInstance: {fileID: 8346879978074404575}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &2655772653335430345 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
+  m_PrefabInstance: {fileID: 8346879978074404575}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8559068278985568436
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -21108,11 +21145,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ac85e3e5ad9407348b5dd30622d93042, type: 3}
---- !u!1 &6595588669394998964 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2559099993529710054, guid: ac85e3e5ad9407348b5dd30622d93042, type: 3}
-  m_PrefabInstance: {fileID: 8650151620495778642}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &4492810821960696766 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 5067157279960473836, guid: ac85e3e5ad9407348b5dd30622d93042, type: 3}
@@ -21129,6 +21161,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &6595588669394998964 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2559099993529710054, guid: ac85e3e5ad9407348b5dd30622d93042, type: 3}
+  m_PrefabInstance: {fileID: 8650151620495778642}
+  m_PrefabAsset: {fileID: 0}
 --- !u!223 &7995132076576865470
 Canvas:
   m_ObjectHideFlags: 0
@@ -21358,6 +21395,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+--- !u!224 &336468674541579701 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 9118334328579025398}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &7488803974071522944 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
@@ -21374,11 +21416,6 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
   m_PrefabInstance: {fileID: 9118334328579025398}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &336468674541579701 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 9118334328579025398}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &9162792165743446020
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/prefabs/ui/battle/battle_ui_pvp.prefab

@@ -3935,6 +3935,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 766509631108997893}
+  - component: {fileID: 6988835359103472858}
+  - component: {fileID: 3947455518926567704}
   m_Layer: 5
   m_Name: battle_node
   m_TagString: Untagged
@@ -3962,6 +3964,40 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -100}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &6988835359103472858
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2716961016822480841}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &3947455518926567704
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2716961016822480841}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9fff095fb5ba641dca2ce92e4551cd53, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GroupOrder: 11
 --- !u!1 &2813004788605635321
 GameObject:
   m_ObjectHideFlags: 0
@@ -13101,6 +13137,7 @@ MonoBehaviour:
   - {fileID: 7465358789532404106}
   - {fileID: 4167430432781634993}
   - {fileID: 6213151299807007232}
+  - {fileID: 3947455518926567704}
   NotchScreenNodeList:
   - gameObject: {fileID: 822431826545976571}
     adjustHeight: 0
@@ -13635,16 +13672,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
---- !u!1 &4532191219610058284 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
-  m_PrefabInstance: {fileID: 164396171060211616}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &4823950210164062713 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
   m_PrefabInstance: {fileID: 164396171060211616}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &4532191219610058284 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
+  m_PrefabInstance: {fileID: 164396171060211616}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &338192663816925351
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13754,16 +13791,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
---- !u!1 &5251450649081893164 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
-  m_PrefabInstance: {fileID: 338192663816925351}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &6033873909542273713 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
   m_PrefabInstance: {fileID: 338192663816925351}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &5251450649081893164 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
+  m_PrefabInstance: {fileID: 338192663816925351}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &352145542058850513
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13983,16 +14020,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
---- !u!1 &5027872977387216185 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
-  m_PrefabInstance: {fileID: 691286259213368498}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &6816990805974437540 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
   m_PrefabInstance: {fileID: 691286259213368498}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &5027872977387216185 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
+  m_PrefabInstance: {fileID: 691286259213368498}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &804440754322103864
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -14098,16 +14135,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3}
---- !u!224 &5731992020734359942 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3}
-  m_PrefabInstance: {fileID: 804440754322103864}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &3979465587749374139 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 4327981527104624259, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3}
   m_PrefabInstance: {fileID: 804440754322103864}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &5731992020734359942 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4946591509404837822, guid: 730d130eb3cd895468bbe6fc98052d6a, type: 3}
+  m_PrefabInstance: {fileID: 804440754322103864}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1903942574908502180
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -14324,11 +14361,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
---- !u!1 &8566503531597672311 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 2033542972103950154}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &387274128746184764 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
@@ -14345,6 +14377,11 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
   m_PrefabInstance: {fileID: 2033542972103950154}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8566503531597672311 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 2033542972103950154}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2094607664330514013
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -14775,16 +14812,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3}
---- !u!1 &3343385904249035928 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 792060148255419897, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3}
-  m_PrefabInstance: {fileID: 2637949698329948513}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &1132939814864582166 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 3108296850535892855, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3}
   m_PrefabInstance: {fileID: 2637949698329948513}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &3343385904249035928 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 792060148255419897, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3}
+  m_PrefabInstance: {fileID: 2637949698329948513}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2648375038090500601
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -14886,16 +14923,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
---- !u!224 &6836850884875279802 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 2648375038090500601}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5627852521475672516 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
   m_PrefabInstance: {fileID: 2648375038090500601}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &6836850884875279802 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 2648375038090500601}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &4442709066351355535 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
@@ -15111,16 +15148,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
---- !u!224 &8168477757571793664 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
-  m_PrefabInstance: {fileID: 2761096934613561622}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &7638111485037219997 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
   m_PrefabInstance: {fileID: 2761096934613561622}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &8168477757571793664 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
+  m_PrefabInstance: {fileID: 2761096934613561622}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2768233015714328304
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -15230,16 +15267,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
---- !u!1 &7654953506035404667 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
-  m_PrefabInstance: {fileID: 2768233015714328304}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &8171673184800185574 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
   m_PrefabInstance: {fileID: 2768233015714328304}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &7654953506035404667 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
+  m_PrefabInstance: {fileID: 2768233015714328304}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2852916185352659568
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -15463,11 +15500,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
---- !u!1 &4898470219173313352 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 2963387977643518837}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &3478844763786449923 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
@@ -15484,6 +15516,11 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
   m_PrefabInstance: {fileID: 2963387977643518837}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &4898470219173313352 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 2963387977643518837}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3501028591294518496
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -15906,6 +15943,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+--- !u!1 &6342045534847793287 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 3664159692944910522}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &5257954124370160889 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 3664159692944910522}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &3152223525992650700 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
@@ -15917,16 +15964,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!224 &5257954124370160889 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 3664159692944910522}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &6342045534847793287 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 3664159692944910522}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &3992249562554997052
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16028,16 +16065,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 946f25630e86bd847a044f0166fad320, type: 3}
---- !u!224 &980076116987371206 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4251046042971981818, guid: 946f25630e86bd847a044f0166fad320, type: 3}
-  m_PrefabInstance: {fileID: 3992249562554997052}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &617831506653770815 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 4608778532194675971, guid: 946f25630e86bd847a044f0166fad320, type: 3}
   m_PrefabInstance: {fileID: 3992249562554997052}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &980076116987371206 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4251046042971981818, guid: 946f25630e86bd847a044f0166fad320, type: 3}
+  m_PrefabInstance: {fileID: 3992249562554997052}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4238194873576598169
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16365,16 +16402,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
---- !u!1 &8307245674427444039 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
-  m_PrefabInstance: {fileID: 4546424542139239116}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &7499906518131898586 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
   m_PrefabInstance: {fileID: 4546424542139239116}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8307245674427444039 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
+  m_PrefabInstance: {fileID: 4546424542139239116}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4594038489666354068
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16472,16 +16509,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
---- !u!1 &1925794663858480210 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2700050507860828102, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
-  m_PrefabInstance: {fileID: 4594038489666354068}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &2284125976732667563 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2338377368704152895, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
   m_PrefabInstance: {fileID: 4594038489666354068}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1925794663858480210 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2700050507860828102, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
+  m_PrefabInstance: {fileID: 4594038489666354068}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4886286828465214128
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16579,16 +16616,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3}
---- !u!1 &5274389685997092681 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 792060148255419897, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3}
-  m_PrefabInstance: {fileID: 4886286828465214128}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &7560823041161074119 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 3108296850535892855, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3}
   m_PrefabInstance: {fileID: 4886286828465214128}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &5274389685997092681 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 792060148255419897, guid: 1385bbdcd9a6a404d9906a1f76a745cf, type: 3}
+  m_PrefabInstance: {fileID: 4886286828465214128}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4946890495658564103
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -16963,16 +17000,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
---- !u!1 &8568562378450594759 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
-  m_PrefabInstance: {fileID: 5351464385034910283}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &792115507450702866 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
   m_PrefabInstance: {fileID: 5351464385034910283}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8568562378450594759 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
+  m_PrefabInstance: {fileID: 5351464385034910283}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5384453604914569113
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -17082,16 +17119,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4692f05a04b1df14783bb56e126effe2, type: 3}
---- !u!224 &721557103076215232 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: 4692f05a04b1df14783bb56e126effe2, type: 3}
-  m_PrefabInstance: {fileID: 5384453604914569113}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &8508692305156967957 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: 4692f05a04b1df14783bb56e126effe2, type: 3}
   m_PrefabInstance: {fileID: 5384453604914569113}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &721557103076215232 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: 4692f05a04b1df14783bb56e126effe2, type: 3}
+  m_PrefabInstance: {fileID: 5384453604914569113}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5688246229370211124
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -17237,16 +17274,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
---- !u!224 &1029817523774987629 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
-  m_PrefabInstance: {fileID: 5688246229370211124}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &8240790560213506744 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
   m_PrefabInstance: {fileID: 5688246229370211124}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &1029817523774987629 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
+  m_PrefabInstance: {fileID: 5688246229370211124}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5730118907961866331
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -17574,16 +17611,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
---- !u!1 &2017909393656639085 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
-  m_PrefabInstance: {fileID: 5787243185351020518}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &530663027978370544 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 6272705270379491862, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
   m_PrefabInstance: {fileID: 5787243185351020518}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2017909393656639085 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5499289754374906251, guid: 6ddc88d5eabe03d4eb13a16fe9763106, type: 3}
+  m_PrefabInstance: {fileID: 5787243185351020518}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6014568399738436904
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -17788,16 +17825,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
---- !u!224 &8353668785482033763 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2338377368704152895, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
-  m_PrefabInstance: {fileID: 6025152556865462108}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &8567295588681957530 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2700050507860828102, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
   m_PrefabInstance: {fileID: 6025152556865462108}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &8353668785482033763 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2338377368704152895, guid: 2576d47a508da8d4f910006b0fc2b393, type: 3}
+  m_PrefabInstance: {fileID: 6025152556865462108}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6281625263577488710
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -17943,16 +17980,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
---- !u!1 &7746559084762877130 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
-  m_PrefabInstance: {fileID: 6281625263577488710}
-  m_PrefabAsset: {fileID: 0}
 --- !u!224 &1699757838083181343 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
   m_PrefabInstance: {fileID: 6281625263577488710}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &7746559084762877130 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
+  m_PrefabInstance: {fileID: 6281625263577488710}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6566824491069929416
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -18383,16 +18420,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3}
---- !u!224 &3805452112780877915 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6124372206462679079, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3}
-  m_PrefabInstance: {fileID: 6931473696039884924}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &3586196789030832802 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 5905679678307275486, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3}
   m_PrefabInstance: {fileID: 6931473696039884924}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &3805452112780877915 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6124372206462679079, guid: 4fc8e309637796d4d917831e70f46d2a, type: 3}
+  m_PrefabInstance: {fileID: 6931473696039884924}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7059653059899501897
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -18657,16 +18694,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fab1c2506f4927947a34769a9d072496, type: 3}
---- !u!224 &2706240165845954244 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
-  m_PrefabInstance: {fileID: 7292576075314493597}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6456457455187257617 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 4372325173911228812, guid: fab1c2506f4927947a34769a9d072496, type: 3}
   m_PrefabInstance: {fileID: 7292576075314493597}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &2706240165845954244 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4664058343642732121, guid: fab1c2506f4927947a34769a9d072496, type: 3}
+  m_PrefabInstance: {fileID: 7292576075314493597}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &7297353101838581832
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -18768,6 +18805,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3}
+--- !u!224 &6329628742520661660 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3}
+  m_PrefabInstance: {fileID: 7297353101838581832}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &71845994348189431 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: -1893103426573199681, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3}
@@ -18779,11 +18821,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!224 &6329628742520661660 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 3644041249471915732, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3}
-  m_PrefabInstance: {fileID: 7297353101838581832}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6329628742520661661 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 3644041249471915733, guid: 3a89f99f0c2b5df41ba44af3b5a34c83, type: 3}
@@ -19337,6 +19374,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+--- !u!224 &1655730711205501524 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 7844112730292280855}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &8483838026509853025 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
@@ -19353,11 +19395,6 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
   m_PrefabInstance: {fileID: 7844112730292280855}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &1655730711205501524 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 7844112730292280855}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8343972650729415982
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -19581,6 +19618,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+--- !u!1 &2025817585282637961 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 8559068278985568436}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &929535894792484087 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 8559068278985568436}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &8043618101018578882 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
@@ -19592,16 +19639,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!224 &929535894792484087 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 8559068278985568436}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &2025817585282637961 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 8559068278985568436}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8918699202735449755
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -19699,16 +19736,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: f7eedb9d145640d4480d379b31559783, type: 3}
---- !u!224 &6919387242390991869 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2000459851088434534, guid: f7eedb9d145640d4480d379b31559783, type: 3}
-  m_PrefabInstance: {fileID: 8918699202735449755}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6919387242390991868 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2000459851088434535, guid: f7eedb9d145640d4480d379b31559783, type: 3}
   m_PrefabInstance: {fileID: 8918699202735449755}
   m_PrefabAsset: {fileID: 0}
+--- !u!224 &6919387242390991869 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2000459851088434534, guid: f7eedb9d145640d4480d379b31559783, type: 3}
+  m_PrefabInstance: {fileID: 8918699202735449755}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &9118334328579025398
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -19815,6 +19852,11 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 8800513852818785347, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
   m_PrefabInstance: {fileID: 9118334328579025398}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1463698324221508043 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
+  m_PrefabInstance: {fileID: 9118334328579025398}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &7488803974071522944 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1830510164170702710, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
@@ -19826,8 +19868,3 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 19f68781e20cf4a5e9d966c7126699ce, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &1463698324221508043 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7699692034021216317, guid: 01adc1756a1c55146986fe855897ebc9, type: 3}
-  m_PrefabInstance: {fileID: 9118334328579025398}
-  m_PrefabAsset: {fileID: 0}

Assets/prefabs/ui/hero/hero_detail_ui.prefab

@@ -1805,6 +1805,10 @@ MonoBehaviour:
     hashName: 3519143808
     objectType: 0
     gameObject: {fileID: 750745781982666438}
+  - name: skin_info.scrollrect.viewport.content
+    hashName: 840751760
+    objectType: 0
+    gameObject: {fileID: 6683717902001729857}
 --- !u!1 &725047378153729229
 GameObject:
   m_ObjectHideFlags: 0