1

Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: a263e71fce79f2f4cb5b5f1fa6b7291a
   m_currentHash:
     serializedVersion: 2
-    Hash: 10dec0e512fccb8fa6109ff7d14e31c2
+    Hash: 00000000000000000000000000000000
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_BundleLocalCatalog: 0
@@ -44,6 +44,7 @@ MonoBehaviour:
   m_BuildAddressablesWithPlayerBuild: 0
   m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
   m_GroupAssets:
+  - {fileID: 0}
   - {fileID: 11400000, guid: 427f94f67624e374895487c87f881a7f, type: 2}
   - {fileID: 11400000, guid: ca4eb1ed7a9a8bc4bbcc5d865fd723a4, type: 2}
   - {fileID: 11400000, guid: ec57fb26f5bb61544b2831e9485b32fe, type: 2}
@@ -154,7 +155,7 @@ MonoBehaviour:
           m_Key: HostingServiceUploadSpeed
         - m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
           m_ClassName: System.String
-          m_Data: Library/com.unity.addressables/aa/WebGL/WebGL;ServerData/WebGL
+          m_Data: Library/com.unity.addressables/aa/Windows/StandaloneWindows64;ServerData/StandaloneWindows64
           m_Key: ContentRoot
         - m_AssemblyName: mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
           m_ClassName: System.Boolean

Assets/Art/HHWK/res/model/baigujing/hit.anim

@@ -510937,7 +510937,7 @@ AnimationClip:
   m_HasMotionFloatCurves: 0
   m_Events:
   - time: 1.3333334
-    functionName: 
+    functionName: eventHitEnd
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0

Assets/MyGame/Scripts/Manager/CreateFishManager.cs

@@ -43,6 +43,8 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
     private Dictionary<GameTypeEnum, Dictionary<string, RoomFishDetailConfig>> createDic;
     private Dictionary<string, FishTypeConfig> fishDatas;
     public Dictionary<string, MonsterContral> fishDatas_hashCodekey = new Dictionary<string, MonsterContral>();
+    public Dictionary<string, MonsterContral> fishDatas_hashCodekey_Boss = new Dictionary<string, MonsterContral>();
+    public Dictionary<string, MonsterContral> fishDatas_hashCodekey_Small = new Dictionary<string, MonsterContral>();
     // ================= 新增缓存字典 =================
     private Dictionary<string, FishArrayConfig> fishArrayConfigDic;
     private Dictionary<string, FishTypeConfig> fishTypeConfigDic;
@@ -652,6 +654,8 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
             v.monsterData.fishTypeConfig = FishDatas[yz.fishNumber];
             v.guid = createFishData.guid + i;
             fishDatas_hashCodekey[v.guid] = v;
+            fishDatas_hashCodekey_Small[v.guid] = v;
+
             v.moveTime = (BeijingTimeManager.Instance.CurrentTimestampMs - time) / 1000;
             //int pathId = list[Random.Range(0, list.Count)];
             v.Init(pathId.ToString(), cfg.times, true, yz.arrayNumber);
@@ -670,6 +674,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
             v.monsterData.fishTypeConfig = FishDatas[yz.fishNumber];
             v.guid = createFishData.guid + i;
             fishDatas_hashCodekey[v.guid] = v;
+            fishDatas_hashCodekey_Small[v.guid] = v;
             v.moveTime = (BeijingTimeManager.Instance.CurrentTimestampMs - time) / 1000;
 
             //int pathId = list[Random.Range(0, list.Count)];
@@ -706,6 +711,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
             v.monsterData.fishTypeConfig = FishDatas[yz.fishNumber];
             v.guid = createFishData.guid + i;
             v.moveTime = ((BeijingTimeManager.Instance.CurrentTimestampMs - time) / 1000) - i;
+            fishDatas_hashCodekey_Small[v.guid] = v;
 
             fishDatas_hashCodekey[v.guid] = v;
             v.Init(pathId.ToString(), cfg.times, true, yz.arrayNumber);
@@ -751,7 +757,20 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
         v.monsterData.fishTypeConfig = FishDatas[cfg.fishNumber];
         v.guid = createFishData.guid;
         v.moveTime = (BeijingTimeManager.Instance.CurrentTimestampMs - time) / 1000;
-
+        switch (fishType.fishType)
+        {
+            case 1:
+                fishDatas_hashCodekey_Small[v.guid] = v;
+                break;
+            case 2:
+                fishDatas_hashCodekey_Boss[v.guid] = v;
+                break;
+            case 3:
+                fishDatas_hashCodekey_Small[v.guid] = v;
+                break;
+            default:
+                break;
+        }
         fishDatas_hashCodekey[v.guid] = v;
         var list = FishDatas[cfg.fishNumber].pathList;
         string pathId = createFishData.moveLineId;
@@ -894,7 +913,20 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
 
         }
     }
-    public void Id_DideListFish_FX(List<string> ids)
+    public void SyncGameData_SendRendromDieFishID(int count)
+    {
+        List<string> list = new List<string>();
+        if (fishDatas_hashCodekey_Small.Count<count)
+        {
+            foreach (var item in fishDatas_hashCodekey_Small)
+            {
+                list.Add(item.Key);
+            }
+        }
+        
+    }
+
+    public void Id_DieListFish_FX(List<string> ids)
     {
         foreach (var item in ids)
         {
@@ -918,7 +950,37 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
             fishDatas_hashCodekey.Remove(killFish.fishId);
 
             //GameManager.Instance.gameData.roomJoinNotice.gold += killFish.gold;
-            var list = UIManager.Instance.Get<GameMainPanel_XJMH>(UIPanel.MainGamePanelXJMH).list_Sits;
+            List<SitPosData> list = null;
+
+            switch (GameManager.Instance.gameData.currGameType)
+            {
+                case GameType.JQQD:
+                    break;
+                case GameType.defaultPanel:
+                    list = UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelDefault).list_Sits;
+                    break;
+                case GameType.FLZY:
+                    list = UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelFLZY).list_Sits;
+
+                    break;
+                case GameType.TGXX:
+                    list = UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelTGXX).list_Sits;
+
+                    break;
+                case GameType.ZGXQ:
+
+                    break;
+                case GameType.XJMH:
+                    list = UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelXJMH).list_Sits;
+
+                    break;
+                case GameType.HHWK:
+                    list = UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelHHWK).list_Sits;
+
+                    break;
+                default:
+                    break;
+            }
             foreach (var item in list)
             {
                 if (item.user != null)

Assets/MyGame/Scripts/Net/WebSocketReponseList.cs

@@ -131,7 +131,35 @@ namespace Assets.MyGame.Scripts.Net
         public static void SyncPlayerGold(string msg)
         {
             var gold = JsonConvert.DeserializeObject<WebSocketResponseBase<long>>(msg).arguments[0];
-            UIManager.Instance.Get<GameMainPanel_XJMH>(UIPanel.MainGamePanelXJMH).currSitData.goldNum = gold;
+            switch (GameManager.Instance.gameData.currGameType)
+            {
+                case GameType.JQQD:
+                    break;
+                case GameType.defaultPanel:
+                    UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelDefault).currSitData.goldNum = gold;
+                    break;
+                case GameType.FLZY:
+                    UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelFLZY).currSitData.goldNum = gold;
+
+                    break;
+                case GameType.TGXX:
+                    UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelTGXX).currSitData.goldNum = gold;
+
+                    break;
+                case GameType.ZGXQ:
+
+                    break;
+                case GameType.XJMH:
+                    UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelXJMH).currSitData.goldNum = gold;
+
+                    break;
+                case GameType.HHWK:
+                    UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelHHWK).currSitData.goldNum = gold;
+
+                    break;
+                default:
+                    break;
+            }
         }
         public static void GetRoomInfoResult(string msg)
         {

Assets/MyGame/aa/Game/HHWK/Boss/BaiGuJing/Game177_baigujing.prefab

@@ -72,6 +72,7 @@ MonoBehaviour:
   bossName: "\u767D\u9AA8\u7CBE"
   idleAnim: {fileID: 6129148253674940553}
   dieAnim: {fileID: 6970894660364473911}
+  subCamera: {fileID: 4224776573722881310}
 --- !u!1 &7269001152423299688
 GameObject:
   m_ObjectHideFlags: 0
@@ -171,7 +172,7 @@ MonoBehaviour:
   m_RenderShadows: 1
   m_RequiresDepthTextureOption: 2
   m_RequiresOpaqueTextureOption: 2
-  m_CameraType: 0
+  m_CameraType: 1
   m_Cameras: []
   m_RendererIndex: -1
   m_VolumeLayerMask:
@@ -214,7 +215,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1709254077376921, guid: 3f29f63bb226af24ca5ef9bee742c41d, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1709254077376921, guid: 3f29f63bb226af24ca5ef9bee742c41d, type: 3}
       propertyPath: m_TagString
@@ -2526,59 +2527,11 @@ PrefabInstance:
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 1709254077376921, guid: 3f29f63bb226af24ca5ef9bee742c41d,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 527617666033907696}
     - targetCorrespondingSourceObject: {fileID: 1256069497284392, guid: 3f29f63bb226af24ca5ef9bee742c41d,
         type: 3}
       insertIndex: -1
       addedObject: {fileID: 6755330536478290761}
   m_SourcePrefab: {fileID: 100100000, guid: 3f29f63bb226af24ca5ef9bee742c41d, type: 3}
---- !u!1 &6090418692070746370 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1709254077376921, guid: 3f29f63bb226af24ca5ef9bee742c41d,
-    type: 3}
-  m_PrefabInstance: {fileID: 6089870578378490011}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &527617666033907696
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6090418692070746370}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 811dbe57edb5c9c44a26adf557eb3342, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  guid: 
-  monsterData:
-    die_Score: 0
-    isDie: 0
-    fishTypeConfig:
-      fishNumber: 
-      fishName: 
-      fishType: 0
-      fishScore: 0
-      killWeight: 0
-      pathList: 
-  skeleton: {fileID: 0}
-  isSpine: 1
-  fishTypeID: 
-  currState: 0
-  HP: 5
-  effect_Die: {fileID: 0}
-  isMove: 1
-  is3D: 0
-  forwordXYZ: 
-  moveTime: 0
-  isyz: 0
-  yzID: 
-  bossName: 
-  idleAnim: {fileID: 0}
-  dieAnim: {fileID: 0}
 --- !u!1 &6091091446052988851 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1256069497284392, guid: 3f29f63bb226af24ca5ef9bee742c41d,
@@ -2634,7 +2587,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1709254077376921, guid: f9bdcb2c4d107cb49ac89bbec9e44727, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4000342987746139, guid: f9bdcb2c4d107cb49ac89bbec9e44727, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

Assets/MyGame/aa/Game/HHWK/Boss/BaiGuJing/HHWK_BGJ_Boss.cs

@@ -1,20 +1,25 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Rendering.Universal;
 
 public class HHWK_BGJ_Boss : MonsterControl_BossBase
 {
     public Animation idleAnim;
     public Animation dieAnim;
+    public Camera subCamera;
     public override void DieFish(object obj = null)
     {
         idleAnim.CrossFade("hit", 0.3f);
+        //idleAnim.gameObject.SetActive(false);
+        //dieAnim.gameObject.SetActive(true);
     }
     public override void Init(string pathId, float Time, bool isyuzhen = false, string yzID = "")
     {
         base.Init(pathId, Time, isyuzhen, yzID);
         transform.position = Vector3.zero;
-
+        UniversalAdditionalCameraData mainCameraData = mainCamera.GetUniversalAdditionalCameraData();
+        mainCameraData.cameraStack.Add(subCamera);
     }
     public override void OnMoveUpdata()
     {

Assets/MyGame/aa/Game/HHWK/Boss/XiaoBaiLong/Game177_lm.prefab

@@ -39654,6 +39654,21 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: -24.50309
       objectReference: {fileID: 0}
+    - target: {fileID: 199173334745350128, guid: d80c0dc329c23a74fbe66e4c00caa769,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 199349979204078785, guid: d80c0dc329c23a74fbe66e4c00caa769,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 199500050402096248, guid: d80c0dc329c23a74fbe66e4c00caa769,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 3039677174197214652, guid: d80c0dc329c23a74fbe66e4c00caa769, type: 3}
     - {fileID: 114592664909728774, guid: d80c0dc329c23a74fbe66e4c00caa769, type: 3}
@@ -43105,6 +43120,21 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: -24.50309
       objectReference: {fileID: 0}
+    - target: {fileID: 199173334745350128, guid: d80c0dc329c23a74fbe66e4c00caa769,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 199349979204078785, guid: d80c0dc329c23a74fbe66e4c00caa769,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 199500050402096248, guid: d80c0dc329c23a74fbe66e4c00caa769,
+        type: 3}
+      propertyPath: m_Materials.Array.size
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 3039677174197214652, guid: d80c0dc329c23a74fbe66e4c00caa769, type: 3}
     - {fileID: 114592664909728774, guid: d80c0dc329c23a74fbe66e4c00caa769, type: 3}

Assets/MyGame/aa/UI/Game/GameMainPanel_FishBase.cs

@@ -635,6 +635,8 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
             FireBullit(list_Sits[syncGameData.sitPos], fireBullet.angle, fireBullet.isSanShe, fireBullet.auto, fireBullet.isSuoDing, fireBullet.twoRTruuect, false);
         }
     }
+
+
     public void SyncGameData_ChangeTargetMonster(SyncGameData syncGameData)
     {
         if (syncGameData.sitPos != currSitData.posID)
@@ -649,9 +651,13 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
         if (syncGameData.sitPos != currSitData.posID)
         {
             var fireBullet = JsonConvert.DeserializeObject<FrameData_RandomDieFish>(syncGameData.frameData.ToString());
-            CreateFishManager.Instance.Id_DideListFish_FX(fireBullet.guids);
+            CreateFishManager.Instance.Id_DieListFish_FX(fireBullet.guids);
         }
     }
+
+
+
+
     private async Task FireBullit(SitPosData sitPosData, float angle, bool isSanShe, bool auto, bool isSuoDing, bool twoRTruuect, bool isSelf = true)
     {
         
@@ -750,6 +756,7 @@ public class GameMainPanel_FishBase : GameMainPanel_Base
                 }
                 GameManager.Instance.gameData.roomJoinNotice = v.arguments[0];
                 isfirstShow = false;
+                
                 currSitData = list_Sits[roomJoinNotice.position];
                 //currSitData.ChangeTurret(1);
                 currSitData.lockFX.transform.GetChild(0).gameObject.SetActive(false);

Assets/MyGame/aa/UI/Game/HHWK/GameMainPanel_HHWK.prefab

@@ -9,7 +9,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2596314787833613557}
-  - component: {fileID: 7362551838251396793}
   - component: {fileID: 1736561711096904313}
   m_Layer: 5
   m_Name: "\u5DE6\u4E0B (2)"
@@ -31,7 +30,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 247534609986168792}
-  - {fileID: 1004972950537348528}
+  - {fileID: 3335822488063611215}
   m_Father: {fileID: 8080891624328096898}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -39,32 +38,6 @@ RectTransform:
   m_AnchoredPosition: {x: 396.25, y: 186.59}
   m_SizeDelta: {x: 792.5019, y: 373.1728}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &7362551838251396793
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 155713557277288527}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 107
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 6
-  m_Spacing: 21.5
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
 --- !u!114 &1736561711096904313
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1430,6 +1403,81 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2790700676448092143
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 665852590045545119}
+  - component: {fileID: 7837353469515664132}
+  - component: {fileID: 4349118222740742741}
+  m_Layer: 5
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &665852590045545119
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2790700676448092143}
+  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: 1466882474003310974}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 128, y: 128}
+  m_SizeDelta: {x: 256, y: 256}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7837353469515664132
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2790700676448092143}
+  m_CullTransparentMesh: 1
+--- !u!114 &4349118222740742741
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2790700676448092143}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0, 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_Sprite: {fileID: 21300000, guid: d1802871c6e988242a9d6d70ab47ebe8, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &2831381340655937899
 GameObject:
   m_ObjectHideFlags: 0
@@ -2664,6 +2712,81 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4188519415235328100
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6930433479022526187}
+  - component: {fileID: 460296161476471515}
+  - component: {fileID: 189417493252960109}
+  m_Layer: 5
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6930433479022526187
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4188519415235328100}
+  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: 1466882474003310974}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 128, y: 128}
+  m_SizeDelta: {x: 256, y: 256}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &460296161476471515
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4188519415235328100}
+  m_CullTransparentMesh: 1
+--- !u!114 &189417493252960109
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4188519415235328100}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.31055474, 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_Sprite: {fileID: 21300000, guid: d1802871c6e988242a9d6d70ab47ebe8, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &4192543961957482279
 GameObject:
   m_ObjectHideFlags: 0
@@ -3241,10 +3364,10 @@ RectTransform:
   - {fileID: 3901745422710490080}
   m_Father: {fileID: 8080891624328096898}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -405.93384, y: -224}
-  m_SizeDelta: {x: 812.132, y: 186.42029}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 812, y: 375}
+  m_SizeDelta: {x: 227.64392, y: 186.42029}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5780113732610609701
 GameObject:
@@ -3350,10 +3473,10 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 7842813480714035454}
   - {fileID: 6841694207947215728}
   - {fileID: 2596314787833613557}
   - {fileID: 6442325590043047767}
+  - {fileID: 7842813480714035454}
   - {fileID: 1015444153936373093}
   - {fileID: 1424544957975917330}
   - {fileID: 6423145012526947125}
@@ -4611,42 +4734,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &7425246170940351510
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1004972950537348528}
-  m_Layer: 5
-  m_Name: GameObject
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1004972950537348528
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7425246170940351510}
-  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: 3335822488063611215}
-  m_Father: {fileID: 2596314787833613557}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0}
 --- !u!1 &7565439529093735719
 GameObject:
   m_ObjectHideFlags: 0
@@ -4965,9 +5052,9 @@ RectTransform:
   - {fileID: 7981661816614151768}
   m_Father: {fileID: 2596314787833613557}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 226.54895, y: -323.6728}
   m_SizeDelta: {x: 239.0979, y: 99}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6348447730536623985
@@ -5037,7 +5124,9 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.85331, y: 0.85331, z: 0.85331}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 665852590045545119}
+  - {fileID: 6930433479022526187}
   m_Father: {fileID: 3335822488063611215}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -5196,13 +5285,13 @@ RectTransform:
   - {fileID: 1550374269597353536}
   - {fileID: 1896844438682953564}
   - {fileID: 1466882474003310974}
-  m_Father: {fileID: 1004972950537348528}
+  m_Father: {fileID: 2596314787833613557}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 452.34695, y: 37.5}
   m_SizeDelta: {x: 170, y: 75}
-  m_Pivot: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5907384768422482681
 CanvasRenderer:
   m_ObjectHideFlags: 0

Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab

@@ -295,10 +295,10 @@ RectTransform:
   - {fileID: 2915075105150539955}
   m_Father: {fileID: 245637205031072731}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -405.93396, y: -224}
-  m_SizeDelta: {x: 812.132, y: 186.42029}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 812, y: 375}
+  m_SizeDelta: {x: 256, y: 256}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &613734813677283919
 GameObject:
@@ -3457,9 +3457,9 @@ RectTransform:
   - {fileID: 4638896631375500037}
   m_Father: {fileID: 6172531420321643531}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 344.19986, y: 55.500023}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 66}
   m_SizeDelta: {x: 256, y: 256}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &45333424778729664
@@ -7060,7 +7060,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8019622945320605939
 RectTransform:
   m_ObjectHideFlags: 0

Assets/MyGame/aa/UI/Home/Sub/SelectGameLeave/HHWK/Leave2.renderTexture

@@ -30,7 +30,7 @@ RenderTexture:
   m_TextureSettings:
     serializedVersion: 2
     m_FilterMode: 1
-    m_Aniso: 1
+    m_Aniso: 0
     m_MipBias: 0
     m_WrapU: 1
     m_WrapV: 1