1

Assets/MyGame/Scripts/Characters/Monster/MonsterContral.cs

@@ -26,6 +26,7 @@ public class MonsterContral : MonoBehaviour
     public CharacterStateType currState;
     public int HP = 5;
     public GameObject effect_Die;//删除
+    public GameObject effect_DieAward;
     GameObject hurt;
     public bool isMove = true;
     public bool is3D = false;

Assets/MyGame/Scripts/Manager/CreateFishManager.cs

@@ -189,6 +189,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
     private NativeArray<float> frequencies;
     private NativeArray<int> shouldSpawn;
     public GameObject dieFXPrefab;
+    public GameObject dieFXPrefabAward;
     private List<RoomFishDetailConfig> spawnList; // 当前房间的鱼配置
     private Dictionary<string, RoomFishDetailConfig> spawnDic; // 当前房间的鱼配置
     Dictionary<FishTypeEnum, List<RoomFishDetailConfig>> fishTypeConfig;//当前房间鱼类型配置列表
@@ -383,7 +384,9 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
         return result.ToList();
     }
 
-
+    /// <summary>
+    /// 检测是否创建鱼（主线程执行，负责生成鱼对象）
+    /// </summary>
     private void Update()
     {
         if (spawnList == null)
@@ -417,14 +420,14 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
                 {
                     list.Add(item);
                 }
-                //list[Random.Range(0, c.Count)].isCreate = 2;
-                foreach (var item in list)
-                {
-                    if (item.fishNumber == 13029.ToString())
-                    {
-                        item.isCreate = 2;
-                    }
-                }
+                list[Random.Range(0, list.Count)].isCreate = 2;
+                //foreach (var item in list)
+                //{
+                //    if (item.fishNumber == 13029.ToString())
+                //    {
+                //        item.isCreate = 2;
+                //    }
+                //}
             }
             boss = 25;
         }
@@ -542,6 +545,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
             }
         }
     }
+    #region 创建鱼
     public void CreateFish(SyncGameData syncGameData)
     {
         //if (syncGameData.sitPos == GameManager.Instance.gameData.roomJoinNotice.position)
@@ -844,6 +848,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
 
 
     }
+    #endregion
     public void EnterRoom(GameTypeEnum gameType)
     {
         InitSpawnSystem(gameType);
@@ -875,6 +880,83 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
                 break;
         }
     }
+
+    #region 杀鱼
+    /// <summary>
+    /// 随机杀死count条小鱼/黄金鱼
+    /// </summary>
+    /// <param name="count"></param>
+    /// <returns></returns>
+    public List<string> SyncGameData_SendRendromDieFishID(int count)
+    {
+        List<string> list = new List<string>();
+        List<string> templist = new List<string>();
+        templist.AddRange(fishDatas_hashCodekey_Small.Keys);
+        if (fishDatas_hashCodekey_Small.Count < count)
+        {
+            foreach (var item in fishDatas_hashCodekey_Small)
+            {
+                list.Add(item.Key);
+            }
+        }
+        else
+        {
+            for (int i = 0; i < count; i++)
+            {
+                int index = Random.Range(0, templist.Count);
+                list.Add(templist[index]);  
+                templist.RemoveAt(index);
+            }
+        }
+        {
+            int posID=0;
+            switch (GameManager.Instance.gameData.currGameType)
+            {
+                case GameType.JQQD:
+                    break;
+                case GameType.defaultPanel:
+                    break;
+                case GameType.FLZY:
+                    posID = UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelFLZY).currSitData.posID;
+
+                    break;
+                case GameType.TGXX:
+                    posID = UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelTGXX).currSitData.posID;
+
+                    break;
+                case GameType.ZGXQ:
+
+                    break;
+                case GameType.XJMH:
+                    posID = UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelXJMH).currSitData.posID;
+
+                    break;
+                case GameType.HHWK:
+                    posID = UIManager.Instance.Get<GameMainPanel_FishBase>(UIPanel.MainGamePanelHHWK).currSitData.posID;
+
+                    break;
+                default:
+                    break;
+            }
+            SyncGameData sgd = new SyncGameData
+            {
+
+
+
+                sitPos = posID,
+                frameType = FrameDataType.changeAutoTarget,
+                time = BeijingTimeManager.Instance.CurrentTimestampMs,
+                frameData = new FrameData_RandomDieFish
+                {
+                    guids = list
+                }
+            };
+
+            WebSocketSendList.SyncGameData(sgd);
+        }
+        return list;
+
+    }
     public void Id_DieFish_NotFX(string fishId)
     {
         if (fishDatas_hashCodekey.ContainsKey(fishId))
@@ -892,6 +974,10 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
             AudioManager.Instance.PlayerFX(60004);
             var monster = fishDatas_hashCodekey[fishId];
             Instantiate(monster.effect_Die == null ? dieFXPrefab : monster.effect_Die, monster.transform.position, Quaternion.identity, transform.parent);
+            //award效果
+             //Instantiate(monster.effect_DieAward == null ? dieFXPrefabAward : monster.effect_DieAward, monster.transform.position, Quaternion.identity, transform.parent);
+
+
             MonsterDieList.Instance.SmallHuangYiHuang(monster.transform.position, monster.monsterData.fishTypeConfig.fishNumber, 1000);
             //Destroy(monster.gameObject);
             monster.DieFish();
@@ -913,18 +999,6 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
 
         }
     }
-    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)
     {
@@ -994,6 +1068,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
 
         }
     }
+    #endregion
 
 }
 

Assets/MyGame/Scripts/Manager/GameManager.cs

@@ -104,7 +104,10 @@ public class GameManager : MonoSingleton<GameManager>
     void Start()
     {
         var v = UIManager.Instance.ShowLoadPanel(startVideoClip);
-        UIManager.Instance.ShowAsync(UIPanel.LoginPanel,null,null,28);
+        UIManager.Instance.ShowAsync(UIPanel.LoginPanel, null, (a) =>
+        {
+            v.LoadBar(100);
+        }, 28);
         btn_Skip.onClick.AddListener(() =>
         {
             UIManager.Instance.StopShowPanel(); 

Assets/MyGame/Scripts/Net/APIManager.cs

@@ -183,7 +183,7 @@ namespace Assets.MyGame.Scripts.Net
                 {
                     var json = req.downloadHandler.text;
                     var res = JsonConvert.DeserializeObject<APIResponse<T>>(json);
-
+                    Debug.Log("url----" + url+"--"+ "Json-"+json+"res--"+JsonConvert.SerializeObject(res));
                     // 自动保存 token
                     if (typeof(T) == typeof(UserToken))
                     {
@@ -192,7 +192,6 @@ namespace Assets.MyGame.Scripts.Net
                         Debug.Log("微信登录成功 Token" + token);
 
                     }
-                    Log(json + "\n------Get");
                     if (res.code == 0)
                     {
                         action?.Invoke(res.data);
@@ -237,7 +236,8 @@ namespace Assets.MyGame.Scripts.Net
                 {
                     var json = req.downloadHandler.text;
                     var res = JsonConvert.DeserializeObject<APIResponse<T>>(json);
-                    Log(json + "\n------Post");
+                    Debug.Log("url----" + url + "--" + "Json-" + json + "res--" + JsonConvert.SerializeObject(res));
+
                     if (res.code == 0)
                     {
                         action?.Invoke(res.data);

Assets/MyGame/aa/Game/XJMH/Prefabs/Bullit/Effect/PW_Effect_Hit_Prop1.prefab

@@ -28,13 +28,13 @@ 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_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 3877337548835815928}
   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: -1289, y: -617}
+  m_AnchoredPosition: {x: 0, y: -86}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1875462920040908192
@@ -65,10 +65,10 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: New Text
+  m_text: 123
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 5d4a713fdd931db4c9ce49f068b54e0a, type: 2}
-  m_sharedMaterial: {fileID: 3593458263369068374, guid: 5d4a713fdd931db4c9ce49f068b54e0a,
+  m_fontAsset: {fileID: 11400000, guid: 735a41fce07d6a248ac8072b24bea659, type: 2}
+  m_sharedMaterial: {fileID: -8051530980051683689, guid: 735a41fce07d6a248ac8072b24bea659,
     type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
@@ -85,7 +85,7 @@ MonoBehaviour:
     bottomLeft: {r: 1, g: 1, b: 1, a: 1}
     bottomRight: {r: 1, g: 1, b: 1, a: 1}
   m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
+  m_spriteAsset: {fileID: 11400000, guid: 9bb17450c726c8544918e92ad8bbe4b5, type: 2}
   m_tintAllSprites: 0
   m_StyleSheet: {fileID: 0}
   m_TextStyleHashCode: -1183493901
@@ -93,15 +93,15 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
+  m_fontSize: 126.2
+  m_fontSizeBase: 126.2
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0
@@ -16645,7 +16645,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1709254077376921, guid: 2f4446363437c5c41a4fff1d3062e479, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 223705390221481576, guid: 2f4446363437c5c41a4fff1d3062e479,
         type: 3}
@@ -16660,7 +16660,7 @@ PrefabInstance:
     - target: {fileID: 223705390221481576, guid: 2f4446363437c5c41a4fff1d3062e479,
         type: 3}
       propertyPath: m_AdditionalShaderChannelsFlag
-      value: 0
+      value: 25
       objectReference: {fileID: 0}
     - target: {fileID: 224985305603660343, guid: 2f4446363437c5c41a4fff1d3062e479,
         type: 3}

Assets/MyGame/aa/UI/Home/Sub/SelectRoomPanel.prefab

@@ -513,7 +513,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &9121793279951611368
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3734,126 +3734,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!1 &4377285974968955888
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2233482273420025243}
-  - component: {fileID: 782603858596917704}
-  - component: {fileID: 8534843319512967255}
-  - component: {fileID: 8749166676632268008}
-  m_Layer: 5
-  m_Name: SelectSeat2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2233482273420025243
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4377285974968955888}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.85999995, y: 0.85999995, z: 0.85999995}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8089897460392818443}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &782603858596917704
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4377285974968955888}
-  m_CullTransparentMesh: 1
---- !u!114 &8534843319512967255
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4377285974968955888}
-  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: 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_Sprite: {fileID: 21300000, guid: 6b3195f69eabbf445bc3bf6ed8752fe0, 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!114 &8749166676632268008
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4377285974968955888}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  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}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    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: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 8534843319512967255}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &4541210506053502196
 GameObject:
   m_ObjectHideFlags: 0
@@ -4059,7 +3939,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6826483301251516954
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4873,7 +4753,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 323996508932873294}
-  - {fileID: 2233482273420025243}
   - {fileID: 5590739882197594523}
   - {fileID: 5115574345652533113}
   - {fileID: 3520259840726105137}
@@ -8144,7 +8023,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4040551977549150708
 RectTransform:
   m_ObjectHideFlags: 0

Assets/MyGame/aa/UI/Home/Sub/ServicePanel.prefab

@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 8670904583298490370}
   - component: {fileID: 325951054345398789}
   - component: {fileID: 1837835653608423112}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -108,7 +108,7 @@ GameObject:
   - component: {fileID: 4144480183065910834}
   - component: {fileID: 2813318877703010542}
   - component: {fileID: 908079249264142059}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: "\u56FE\u5C42 1"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -206,7 +206,7 @@ GameObject:
   - component: {fileID: 265352195632268537}
   - component: {fileID: 5689992564721513758}
   - component: {fileID: 5498182412605295994}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: kf_txt_1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -281,7 +281,7 @@ GameObject:
   - component: {fileID: 6629586400871431460}
   - component: {fileID: 1561208010883640526}
   - component: {fileID: 6435121020127340777}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: "\u5E38\u89C1\u95EE\u9898_1"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -357,7 +357,7 @@ GameObject:
   - component: {fileID: 3582465180928893522}
   - component: {fileID: 1143532611386369518}
   - component: {fileID: 8698620349214601768}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -506,7 +506,7 @@ GameObject:
   - component: {fileID: 5145220391040240892}
   - component: {fileID: 2628092742503683245}
   - component: {fileID: 3270609462111155511}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -583,7 +583,7 @@ GameObject:
   - component: {fileID: 7719287007731044515}
   - component: {fileID: 4020341946303008007}
   - component: {fileID: 8710877298468264631}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -719,7 +719,7 @@ GameObject:
   - component: {fileID: 3782712310896558582}
   - component: {fileID: 5736487034535729463}
   - component: {fileID: 8706487739029897855}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: YKGJ_btn_gb
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -838,7 +838,7 @@ GameObject:
   - component: {fileID: 1675592530201009503}
   - component: {fileID: 5032331432922840710}
   - component: {fileID: 792993846390060201}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: "\u4F60\u63D0\u6211\u6539"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -911,7 +911,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 298266024152911993}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Send
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -952,7 +952,7 @@ GameObject:
   - component: {fileID: 8403337047529264072}
   - component: {fileID: 1108614690594346404}
   - component: {fileID: 8686580130806984849}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Text (TMP) (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1101,7 +1101,7 @@ GameObject:
   - component: {fileID: 5116541710676871874}
   - component: {fileID: 8476546394689861663}
   - component: {fileID: 4795673608136158837}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1237,7 +1237,7 @@ GameObject:
   - component: {fileID: 5416825327015070706}
   - component: {fileID: 229644886718727724}
   - component: {fileID: 65600378618580330}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: SelectPicture
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1359,7 +1359,7 @@ GameObject:
   - component: {fileID: 4652927337457648553}
   - component: {fileID: 2075070454084857433}
   - component: {fileID: 2829035150684933233}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: orange
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1494,7 +1494,7 @@ GameObject:
   m_Component:
   - component: {fileID: 113428240938966747}
   - component: {fileID: 5613642862314084434}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Text Area
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1549,7 +1549,7 @@ GameObject:
   - component: {fileID: 6247852797035154744}
   - component: {fileID: 4624711749379070709}
   - component: {fileID: 6621839582896251780}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1659,7 +1659,7 @@ GameObject:
   - component: {fileID: 7908162487468359882}
   - component: {fileID: 8331987541644135303}
   - component: {fileID: 2136711771860080809}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1813,7 +1813,7 @@ GameObject:
   - component: {fileID: 2857933377537439635}
   - component: {fileID: 3114395124869928957}
   - component: {fileID: 7533122841499013282}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: green (2)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1950,7 +1950,7 @@ GameObject:
   - component: {fileID: 5296098666546292721}
   - component: {fileID: 7920721426757758935}
   - component: {fileID: 5467105243997155109}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: "\u73A9\u5BB6label"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2028,7 +2028,7 @@ GameObject:
   - component: {fileID: 5230172342664579655}
   - component: {fileID: 598616052371914426}
   - component: {fileID: 8254923615718863144}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: orangeitem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2133,7 +2133,7 @@ GameObject:
   - component: {fileID: 2797091450366390532}
   - component: {fileID: 9180945192984325657}
   - component: {fileID: 1065776505534312473}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2282,7 +2282,7 @@ GameObject:
   - component: {fileID: 432789762024571590}
   - component: {fileID: 4961695640425072426}
   - component: {fileID: 1815206646896372097}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: ZSZLB_btn_green_0
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2360,7 +2360,7 @@ GameObject:
   - component: {fileID: 8344764290048555839}
   - component: {fileID: 1774915736270412573}
   - component: {fileID: 7869981614005578374}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: green
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2498,7 +2498,7 @@ GameObject:
   - component: {fileID: 1966090756902523589}
   - component: {fileID: 7381443315458241373}
   - component: {fileID: 1087996991676386563}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: greenitem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2603,7 +2603,7 @@ GameObject:
   - component: {fileID: 2668202144375216303}
   - component: {fileID: 9153611277649199875}
   - component: {fileID: 1661656016717164537}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Scroll View
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2710,7 +2710,7 @@ GameObject:
   - component: {fileID: 9095080030222886153}
   - component: {fileID: 7634179592773690797}
   - component: {fileID: 7345530499156928456}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Text (TMP) (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2859,7 +2859,7 @@ GameObject:
   - component: {fileID: 6572353587484992282}
   - component: {fileID: 5337648887150018901}
   - component: {fileID: 617905519820540336}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: "\u4E13\u5C5E\u5BA2\u670D_1"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2934,7 +2934,7 @@ GameObject:
   - component: {fileID: 263981320477998795}
   - component: {fileID: 455952383286271360}
   - component: {fileID: 3309333382459762173}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: "\u4F60\u63D0\u6211\u6539_1"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3009,7 +3009,7 @@ GameObject:
   - component: {fileID: 7605967202206720983}
   - component: {fileID: 7179763992181563115}
   - component: {fileID: 1334048166197180193}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: "\u4E13\u5C5E\u5BA2\u670D"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3085,7 +3085,7 @@ GameObject:
   - component: {fileID: 3217458842779418868}
   - component: {fileID: 1994410302282123214}
   - component: {fileID: 880172178013717710}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3181,7 +3181,7 @@ GameObject:
   - component: {fileID: 3196478708597935320}
   - component: {fileID: 4910962805508323878}
   - component: {fileID: 4181643992246437403}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3331,7 +3331,7 @@ GameObject:
   - component: {fileID: 4547218351626896328}
   - component: {fileID: 7689253216189857323}
   - component: {fileID: 265295754650036814}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3427,7 +3427,7 @@ GameObject:
   - component: {fileID: 3273165334217255222}
   - component: {fileID: 5672291738353874606}
   - component: {fileID: 2856976859221304650}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Viewport
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3518,7 +3518,7 @@ GameObject:
   - component: {fileID: 8053061106341327378}
   - component: {fileID: 6442433320810787472}
   - component: {fileID: 867493537761666578}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: zsbk_tab_1_1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3654,7 +3654,7 @@ GameObject:
   m_Component:
   - component: {fileID: 199172646652219513}
   - component: {fileID: 2285380866168456162}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: kefu
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3705,7 +3705,7 @@ GameObject:
   - component: {fileID: 6551800928551512211}
   - component: {fileID: 7580649336005315289}
   - component: {fileID: 637036671885419331}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: "\u8BF7\u8F93\u5165\u60A8\u7684\u8BE6\u7EC6\u95EE\u9898\u6216\u5EFA\u8BAE"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3781,7 +3781,7 @@ GameObject:
   - component: {fileID: 6848967464421689050}
   - component: {fileID: 9016324528881506716}
   - component: {fileID: 5725012886675176705}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Viewport
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3870,7 +3870,7 @@ GameObject:
   - component: {fileID: 5337379417675970028}
   - component: {fileID: 8432116592536611491}
   - component: {fileID: 4713403978183025638}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: "\u4F60\u63D0\u6211\u6539"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -3948,7 +3948,7 @@ GameObject:
   - component: {fileID: 5342323200592058024}
   - component: {fileID: 5268904905953795716}
   - component: {fileID: 5598271075492067753}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: "\u5E38\u89C1\u95EE\u9898"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4024,7 +4024,7 @@ GameObject:
   - component: {fileID: 2963548883020376645}
   - component: {fileID: 5152449960383681170}
   - component: {fileID: 8779605733858429284}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: zsbk_tab_1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4162,7 +4162,7 @@ GameObject:
   - component: {fileID: 8311834237931874335}
   - component: {fileID: 7801849351254979801}
   - component: {fileID: 9092440007777254273}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: SendBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4283,7 +4283,7 @@ GameObject:
   - component: {fileID: 5920144006903007580}
   - component: {fileID: 7527642287533736449}
   - component: {fileID: 1624319268690464800}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4392,7 +4392,7 @@ GameObject:
   - component: {fileID: 4081387076419459168}
   - component: {fileID: 5013850366325684361}
   - component: {fileID: 6788653910643912317}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: NZXL_New_cbfg_1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4465,7 +4465,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3417672680716030127}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: prafab
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4505,7 +4505,7 @@ GameObject:
   - component: {fileID: 1763041055972645857}
   - component: {fileID: 1202700517646067761}
   - component: {fileID: 74384769299637662}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: InputField (TMP)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4679,7 +4679,7 @@ GameObject:
   - component: {fileID: 4932209434674487543}
   - component: {fileID: 137125071059677932}
   - component: {fileID: 6899005616514101206}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: "\u63D0 \u4EA4"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4754,7 +4754,7 @@ GameObject:
   - component: {fileID: 1502619659065698494}
   - component: {fileID: 6421321551881289907}
   - component: {fileID: 5721981328311069240}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: NZXL_New_cbfg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4829,7 +4829,7 @@ GameObject:
   - component: {fileID: 7483721355026875957}
   - component: {fileID: 7816470758559329148}
   - component: {fileID: 7705422919093258839}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: "\u5BA2\u670Dlabel"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -4908,7 +4908,7 @@ GameObject:
   - component: {fileID: 1005630260715216382}
   - component: {fileID: 4066126160541312844}
   - component: {fileID: 764270396794415328}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: green (2)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5047,7 +5047,7 @@ GameObject:
   - component: {fileID: 3620283906650652862}
   - component: {fileID: 117544272471357770}
   - component: {fileID: 4809961045789753024}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5198,7 +5198,7 @@ GameObject:
   - component: {fileID: 4987150367772151505}
   - component: {fileID: 5814307756597073845}
   - component: {fileID: 3768780483186100159}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5434,7 +5434,7 @@ GameObject:
   - component: {fileID: 6389808633010172007}
   - component: {fileID: 6495909469996249096}
   - component: {fileID: 3437016823728720811}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: zsbk_tab_1_2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5572,7 +5572,7 @@ GameObject:
   - component: {fileID: 6012310520703918224}
   - component: {fileID: 5489641234221653215}
   - component: {fileID: 3249790272882557979}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Scroll View
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5679,7 +5679,7 @@ GameObject:
   - component: {fileID: 2676485678889543201}
   - component: {fileID: 8194563217890697932}
   - component: {fileID: 8660585557102277924}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Placeholder
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5834,7 +5834,7 @@ GameObject:
   - component: {fileID: 2595741521076348832}
   - component: {fileID: 4748068567378196622}
   - component: {fileID: 3180005308677948985}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: "\u56FE\u5C42 2"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5911,7 +5911,7 @@ GameObject:
   - component: {fileID: 3590095161903673633}
   - component: {fileID: 8497150062877449766}
   - component: {fileID: 8767470066381106559}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_SelectRoomLevelPanel.cs

@@ -152,7 +152,7 @@ public class UIHome_BY_SelectRoomLevelPanel : SubUIBase
     public override void Hide()
     {
         base.Hide();
-        img_BG.color = new Color(1,1,1,0);
+        //img_BG.color = new Color(1,1,1,0);
         if (currGameType != GameType.JQQD)
         {
             SelectRoom1.transform.GetChild((int)currGameType+1).gameObject.SetActive(false);

Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ServicePanel.cs

@@ -51,6 +51,8 @@ public class UIHome_BY_ServicePanel : SubUIBase
     }
     public override void Awake()
     {
+        base.Awake();
+        btn_Close.onClick.RemoveAllListeners();
         btn_Close.onClick.AddListener(() =>
         {
             uIManager.Close(UIPanel.ServicePanel);

ProjectSettings/ScriptableBuildPipeline.json

@@ -4,7 +4,6 @@
     "cacheServerPort": 8126,
     "threadedArchiving": true,
     "logCacheMiss": false,
-    "logAssetWarnings": true,
     "slimWriteResults": true,
     "maximumCacheSize": 20,
     "useDetailedBuildLog": false,