背景切换，开始处理形象切换。

UnityProject/Assets/AssetRaw/Effects/Liwu/ADBZ.prefab

@@ -4764,7 +4764,7 @@ ParticleSystemRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1012431290082542737}
-  m_Enabled: 1
+  m_Enabled: 0
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
@@ -9652,7 +9652,7 @@ ParticleSystemRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1859856362277195075}
-  m_Enabled: 1
+  m_Enabled: 0
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
@@ -9728,6 +9728,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8897535720207111140}
   - component: {fileID: 8438179819792013000}
+  - component: {fileID: 3014603996000712126}
   m_Layer: 5
   m_Name: ADBZ
   m_TagString: Untagged
@@ -9744,7 +9745,7 @@ RectTransform:
   m_GameObject: {fileID: 2824577169839544832}
   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_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 65041789006977090}
@@ -9763,6 +9764,44 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2824577169839544832}
   m_CullTransparentMesh: 1
+--- !u!114 &3014603996000712126
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2824577169839544832}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, 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_IsTrail: 0
+  m_IgnoreCanvasScaler: 0
+  m_AbsoluteMode: 0
+  m_Scale3D: {x: 10, y: 10, z: 10}
+  m_AnimatableProperties: []
+  m_Particles:
+  - {fileID: 19464345355490029}
+  - {fileID: 8839049559151363932}
+  - {fileID: 1443586078035824756}
+  m_MeshSharing: 0
+  m_GroupId: 0
+  m_GroupMaxId: 0
+  m_PositionMode: 0
+  m_AutoScaling: 0
+  m_AutoScalingMode: 2
+  m_UseCustomView: 0
+  m_CustomViewSize: 10
+  m_TimeScaleMultiplier: 1
 --- !u!1 &4995562779342638044
 GameObject:
   m_ObjectHideFlags: 0
@@ -14585,7 +14624,7 @@ ParticleSystemRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4995562779342638044}
-  m_Enabled: 1
+  m_Enabled: 0
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1

UnityProject/Assets/AssetRaw/Materials/JDT7.mat

@@ -11,7 +11,8 @@ Material:
   m_Shader: {fileID: 4800000, guid: 8051d8a533a10b541a591e43ef313e96, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _USEONEEM_ON
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -191,7 +192,7 @@ Material:
     - _UseEmTex_R_A: 0
     - _UseMainTex_RGB_A: 0
     - _UseMainTex_Ramp_RGB_A: 0
-    - _UseOneEM: 0
+    - _UseOneEM: 1
     - _UseOneNoise: 1
     - _UseTur_Mask: 0
     - _Use_Flash: 0

UnityProject/Assets/AssetRaw/Scenes/Game.unity

@@ -196,6 +196,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: 02@Skin
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 75c89d38638666947a43d7615bc1be05, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -1129,6 +1133,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: 04@Skin
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 4d997b3e700fa05438d9a7ce10752b36, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -1381,6 +1389,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: 03@Skin
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 2f926532ce65d3d4ca22ca6c0ad26219, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -1562,6 +1574,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: 05@Skin
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 0d8fe55e876d6e244b132fcde3c9b598, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -1682,6 +1698,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: 01@UE
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 6a66b93cd8f13104d90b73ee0325cc2f, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab

@@ -1609,7 +1609,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1762914308485668896}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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
@@ -1617,7 +1617,7 @@ RectTransform:
   - {fileID: 6200299299619410369}
   - {fileID: 5008610103474660645}
   - {fileID: 8357901266497667185}
-  m_Father: {fileID: 1508900408836313865}
+  m_Father: {fileID: 2090319480340751313}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2143,7 +2143,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2955186089197072273}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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
@@ -2151,7 +2151,7 @@ RectTransform:
   - {fileID: 6069775705069224259}
   - {fileID: 4954370572024601617}
   - {fileID: 2494577718892590801}
-  m_Father: {fileID: 1508900408836313865}
+  m_Father: {fileID: 2090319480340751313}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2300,9 +2300,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 544318309688751102}
+  - {fileID: 2090319480340751313}
-  - {fileID: 3981496210966067268}
-  - {fileID: 3586785766027361055}
   - {fileID: 245133209852100473}
   - {fileID: 6282578790962902355}
   - {fileID: 6805953989209425366}
@@ -2879,6 +2877,44 @@ RectTransform:
   m_AnchoredPosition: {x: -0.0012207, y: 0.0020752}
   m_SizeDelta: {x: 1080, y: 2340.6}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5797548325938105504
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2090319480340751313}
+  m_Layer: 5
+  m_Name: m_rectBgList
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2090319480340751313
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5797548325938105504}
+  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: 544318309688751102}
+  - {fileID: 3981496210966067268}
+  - {fileID: 3586785766027361055}
+  m_Father: {fileID: 1508900408836313865}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5818212637391323579
 GameObject:
   m_ObjectHideFlags: 0
@@ -3247,7 +3283,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7806227272718274905}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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
@@ -3255,7 +3291,7 @@ RectTransform:
   - {fileID: 1651884260451305499}
   - {fileID: 8085587279355658971}
   - {fileID: 2534812568043850157}
-  m_Father: {fileID: 1508900408836313865}
+  m_Father: {fileID: 2090319480340751313}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3765,6 +3801,26 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 6805953989209425366}
     m_Modifications:
+    - target: {fileID: 761074003542636921, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_SortingLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1958658175923126412, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_SortingLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2330608899124152931, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4160557749988399756, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5002375256967900686, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5218893830113109492, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
       propertyPath: m_Name
       value: GiftItem
@@ -3853,6 +3909,26 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6487461901014013817, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_SortingLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6973589894015484857, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7076809747565424400, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_SortingLayer
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7167953597495886277, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7396680082103001841, guid: 3c87f3ae07d99d64fa62efe33b26e010, type: 3}
+      propertyPath: m_SortingLayer
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -3959,6 +4035,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7857543084824031818, guid: 7945afcaefa5a2945bddd43039739591, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs

@@ -64,6 +64,7 @@ namespace GameLogic
         public const string AddPlayer = "AddPlayer";
         public const string AddGiftMessage = "AddGiftMessage";
         public const string TtqEffectCreate = "TtqEffectCreate";
+        public const string SwitchTeamId = "SwitchTeamId";
         #endregion
 
 

UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs

@@ -37,6 +37,10 @@ namespace GameLogic
         private int m_UpdateShowEmoTimer = -1;
 
         public long m_AllTeamPush = 0;
+
+        public int m_TeamId = 0;// 当前朝代Id
+
+
         public void OnInit()
         {
             FindGameComponent();
@@ -132,7 +136,7 @@ namespace GameLogic
             m_DicUnitPlayerDatas.Add(protCustMessageData.openId, unitPlayerData);
 
             // 发送添加玩家事件
-            GameEvent.Send(EventConts.AddPlayer,unitPlayerData);
+            GameEvent.Send(EventConts.AddPlayer, unitPlayerData);
 
             return unitPlayerData;
         }
@@ -275,6 +279,9 @@ namespace GameLogic
             // 增加积分池
             ScoreAllValue += giftConfig.AddGiftScore * num;
 
+            // 触发检测朝代变换
+            CheckGameValue();
+
             // 动态计算公用胜点池
             WinAllValue = (long)Math.Ceiling(ScoreAllValue * 0.00001f);
 
@@ -351,7 +358,6 @@ namespace GameLogic
             }
             else if (giftConfig.Id == 3)
             {
-                Log.Debug("绿仙女棒");
 
                 // 绿仙女棒
                 var actor = GetTeamActor(unitPlayerData.teamId);
@@ -442,14 +448,6 @@ namespace GameLogic
                 AdbzGiftFunc(giftConfig, num, unitPlayerData);
             }
 
-
-            //if (giftConfig.Id != 1)
-            //{
-            //    // 发送玩家送礼事件
-            //    GameEvent.Send(EventConts.AddGiftMessage, unitPlayerData, giftConfig, num);
-            //}
-
-
             // 每次积分变动
             m_TeamSortList.Sort((a, b) =>
             {
@@ -625,6 +623,36 @@ namespace GameLogic
 
         #endregion
 
+
+        /// <summary>
+        /// 游戏朝代检查
+        /// </summary>
+        private void CheckGameValue()
+        {
+
+            int id = 0;
+            for (int i = 0; i < ConfigSystem.Instance.Tables.TbTeamConfig.DataList.Count; i++)
+            {
+                if (ScoreAllValue >= ConfigSystem.Instance.Tables.TbTeamConfig.DataList[i].ScoreTargetValue)
+                {
+                    id = i;
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            // 选出当前朝代Id
+            if (id != m_TeamId)
+            {
+                // 切换朝代
+                m_TeamId = id;
+                GameEvent.Send(EventConts.SwitchTeamId);
+            }
+
+        }
+
         /// <summary>
         /// 游戏结算
         /// </summary>

UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs

@@ -14,6 +14,7 @@ namespace GameLogic
     class UIGameBattle : UIWindow
     {
         #region 脚本工具生成的代码
+        private RectTransform m_rectBgList;
         private TextMeshProUGUI m_tmpTimer;
         private TextMeshProUGUI m_tmpWinPoint;
         private TextMeshProUGUI m_tmpScoreAll;
@@ -22,8 +23,15 @@ namespace GameLogic
         private RectTransform m_rectHPanel;
         private GameObject m_itemActorHItem;
         private RectTransform m_rect_GiftPanel;
+        private RawImage m_rimgHeadIcon;
+        private TextMeshProUGUI m_tmpPlayName;
+        private TextMeshProUGUI m_tmpTeamName;
+        private TextMeshProUGUI m_tmpGiftMsg;
+        private Image m_imgGiftImg;
+        private TextMeshProUGUI m_tmpCount;
         protected override void ScriptGenerator()
         {
+            m_rectBgList = FindChildComponent<RectTransform>("Bg/m_rectBgList");
             m_tmpTimer = FindChildComponent<TextMeshProUGUI>("Bg/Top/TopImg/m_tmpTimer");
             m_tmpWinPoint = FindChildComponent<TextMeshProUGUI>("Bg/Top/TopImg/m_tmpWinPoint");
             m_tmpScoreAll = FindChildComponent<TextMeshProUGUI>("Bg/Top/TopImg/m_tmpScoreAll");
@@ -32,6 +40,12 @@ namespace GameLogic
             m_rectHPanel = FindChildComponent<RectTransform>("Bg/Main/m_rectHPanel");
             m_itemActorHItem = FindChild("Bg/Main/m_rectHPanel/m_itemActorHItem").gameObject;
             m_rect_GiftPanel = FindChildComponent<RectTransform>("Bg/m_rect_GiftPanel");
+            m_rimgHeadIcon = FindChildComponent<RawImage>("Bg/m_rect_GiftPanel/GiftItem/Item/Mask/m_rimgHeadIcon");
+            m_tmpPlayName = FindChildComponent<TextMeshProUGUI>("Bg/m_rect_GiftPanel/GiftItem/Item/m_tmpPlayName");
+            m_tmpTeamName = FindChildComponent<TextMeshProUGUI>("Bg/m_rect_GiftPanel/GiftItem/Item/m_tmpTeamName");
+            m_tmpGiftMsg = FindChildComponent<TextMeshProUGUI>("Bg/m_rect_GiftPanel/GiftItem/Item/m_tmpGiftMsg");
+            m_imgGiftImg = FindChildComponent<Image>("Bg/m_rect_GiftPanel/GiftItem/Item/m_imgGiftImg");
+            m_tmpCount = FindChildComponent<TextMeshProUGUI>("Bg/m_rect_GiftPanel/GiftItem/Item/m_tmpCount");
             m_btnSetting.onClick.AddListener(OnClickSettingBtn);
             m_btnRank.onClick.AddListener(OnClickRankBtn);
         }
@@ -130,6 +144,7 @@ namespace GameLogic
             GameEvent.AddEventListener(EventConts.RestGameBattle, RestGameBattleFunc);
             GameEvent.AddEventListener<GiftConfig>(EventConts.TtqEffectCreate, TtqEffectCreateFunc);
             GameEvent.AddEventListener<UnitPlayerData>(EventConts.AddPlayer, AddPlayerFunc);
+            GameEvent.AddEventListener(EventConts.SwitchTeamId, SwitchTeamIdFunc);
             GameEvent.AddEventListener<UnitPlayerData, GiftConfig, int>(EventConts.AddGiftMessage, AddGiftMessageFunc);
         }
 
@@ -140,16 +155,34 @@ namespace GameLogic
             GameEvent.RemoveEventListener(EventConts.RestGameBattle, RestGameBattleFunc);
             GameEvent.RemoveEventListener<GiftConfig>(EventConts.TtqEffectCreate, TtqEffectCreateFunc);
             GameEvent.RemoveEventListener<UnitPlayerData>(EventConts.AddPlayer, AddPlayerFunc);
+            GameEvent.RemoveEventListener(EventConts.SwitchTeamId, SwitchTeamIdFunc);
             GameEvent.RemoveEventListener<UnitPlayerData, GiftConfig, int>(EventConts.AddGiftMessage, AddGiftMessageFunc);
         }
 
+        private void SwitchTeamIdFunc()
+        {
+            int teamId = DataGameSceneManager.Instance.m_TeamId;
+            for (int i = 0; i < m_rectBgList.childCount; i++)
+            {
+                m_rectBgList.GetChild(i).gameObject.SetActive(false);
+            }
+
+            if (teamId > m_rectBgList.childCount)
+            {
+                Log.Error("背景Id错误" + teamId);
+                return;
+            }
+
+            m_rectBgList.GetChild(teamId).gameObject.SetActive(true);
+        }
+
         private void AddPlayerFunc(UnitPlayerData unitPlayerData)
         {
 
             // 显示加入UI
             var jiaRuItem = GameObject.Instantiate(m_rect_GiftPanel.transform.GetChild(1));
             jiaRuItem.transform.SetParent(m_rect_GiftPanel);
-            jiaRuItem.transform.localScale = Vector3.one ;
+            jiaRuItem.transform.localScale = Vector3.one;
             jiaRuItem.transform.localPosition = Vector3.zero;
             jiaRuItem.gameObject.SetActive(true);
             jiaRuItem.GetComponent<UIJiaRuItem>().OnInit(unitPlayerData);
@@ -179,20 +212,6 @@ namespace GameLogic
             giftItem.transform.localPosition = Vector3.zero;
             giftItem.gameObject.SetActive(true);
             giftItem.GetComponent<UIGiftItem>().OnInit(unitPlayerData, giftConfig, num);
-
-
-            //// 生成飘屏
-            //for (int i = 0; i < 4; i++)
-            //{
-            //	var topTipsTime = GameObject.Instantiate(m_rect_TopTips.transform.GetChild(0));
-            //	topTipsTime.transform.SetParent(m_rect_TopTips);
-            //	topTipsTime.transform.localScale = Vector3.one;
-            //	topTipsTime.transform.localPosition = new Vector3(600, Random.Range(-70, 95));
-            //	topTipsTime.gameObject.SetActive(true);
-            //	topTipsTime.GetComponent<UITopTipsItem>().OnInit(unitPlayerData, giftConfig, num);
-            //	await UniTask.Delay(500);
-            //}
-
         }
 
 

UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/Tables.cs

@@ -13,33 +13,136 @@ namespace GameConfig
 {
 public partial class Tables
 {
-    public item.TbItem TbItem {get; }
+    #region The Tables
-    public actorConfig.TbActorConfig TbActorConfig {get; }
+
-    public giftConfig.TbGiftConfig TbGiftConfig {get; }
+    private item.TbItem m_TbItem;
-    public teamConfig.TbTeamConfig TbTeamConfig {get; }
+    public item.TbItem TbItem 
-    public systemConfig.TbSystemConfig TbSystemConfig {get; }
+    {
-    public playerLevelConfig.TbPlayerLevelConfig TbPlayerLevelConfig {get; }
+        get
+        {
+            if (m_TbItem == null)
+            {
+                m_TbItem = new item.TbItem(defaultLoader("item_tbitem"));
+                m_TbItem.ResolveRef(this);
+            }
+            return m_TbItem;
+        }
+        set
+        {
+            m_TbItem = value;
+            m_TbItem.ResolveRef(this);
+        }
+    }
+    private actorConfig.TbActorConfig m_TbActorConfig;
+    public actorConfig.TbActorConfig TbActorConfig 
+    {
+        get
+        {
+            if (m_TbActorConfig == null)
+            {
+                m_TbActorConfig = new actorConfig.TbActorConfig(defaultLoader("actorconfig_tbactorconfig"));
+                m_TbActorConfig.ResolveRef(this);
+            }
+            return m_TbActorConfig;
+        }
+        set
+        {
+            m_TbActorConfig = value;
+            m_TbActorConfig.ResolveRef(this);
+        }
+    }
+    private giftConfig.TbGiftConfig m_TbGiftConfig;
+    public giftConfig.TbGiftConfig TbGiftConfig 
+    {
+        get
+        {
+            if (m_TbGiftConfig == null)
+            {
+                m_TbGiftConfig = new giftConfig.TbGiftConfig(defaultLoader("giftconfig_tbgiftconfig"));
+                m_TbGiftConfig.ResolveRef(this);
+            }
+            return m_TbGiftConfig;
+        }
+        set
+        {
+            m_TbGiftConfig = value;
+            m_TbGiftConfig.ResolveRef(this);
+        }
+    }
+    private teamConfig.TbTeamConfig m_TbTeamConfig;
+    public teamConfig.TbTeamConfig TbTeamConfig 
+    {
+        get
+        {
+            if (m_TbTeamConfig == null)
+            {
+                m_TbTeamConfig = new teamConfig.TbTeamConfig(defaultLoader("teamconfig_tbteamconfig"));
+                m_TbTeamConfig.ResolveRef(this);
+            }
+            return m_TbTeamConfig;
+        }
+        set
+        {
+            m_TbTeamConfig = value;
+            m_TbTeamConfig.ResolveRef(this);
+        }
+    }
+    private systemConfig.TbSystemConfig m_TbSystemConfig;
+    public systemConfig.TbSystemConfig TbSystemConfig 
+    {
+        get
+        {
+            if (m_TbSystemConfig == null)
+            {
+                m_TbSystemConfig = new systemConfig.TbSystemConfig(defaultLoader("systemconfig_tbsystemconfig"));
+                m_TbSystemConfig.ResolveRef(this);
+            }
+            return m_TbSystemConfig;
+        }
+        set
+        {
+            m_TbSystemConfig = value;
+            m_TbSystemConfig.ResolveRef(this);
+        }
+    }
+    private playerLevelConfig.TbPlayerLevelConfig m_TbPlayerLevelConfig;
+    public playerLevelConfig.TbPlayerLevelConfig TbPlayerLevelConfig 
+    {
+        get
+        {
+            if (m_TbPlayerLevelConfig == null)
+            {
+                m_TbPlayerLevelConfig = new playerLevelConfig.TbPlayerLevelConfig(defaultLoader("playerlevelconfig_tbplayerlevelconfig"));
+                m_TbPlayerLevelConfig.ResolveRef(this);
+            }
+            return m_TbPlayerLevelConfig;
+        }
+        set
+        {
+            m_TbPlayerLevelConfig = value;
+            m_TbPlayerLevelConfig.ResolveRef(this);
+        }
+    }
+
+    #endregion
+
+    System.Func<string, ByteBuf> defaultLoader;
 
     public Tables(System.Func<string, ByteBuf> loader)
     {
-        TbItem = new item.TbItem(loader("item_tbitem"));
+        SetDefaultLoader(loader);
-        TbActorConfig = new actorConfig.TbActorConfig(loader("actorconfig_tbactorconfig"));
+        Init();
-        TbGiftConfig = new giftConfig.TbGiftConfig(loader("giftconfig_tbgiftconfig"));
-        TbTeamConfig = new teamConfig.TbTeamConfig(loader("teamconfig_tbteamconfig"));
-        TbSystemConfig = new systemConfig.TbSystemConfig(loader("systemconfig_tbsystemconfig"));
-        TbPlayerLevelConfig = new playerLevelConfig.TbPlayerLevelConfig(loader("playerlevelconfig_tbplayerlevelconfig"));
-        ResolveRef();
     }
     
-    private void ResolveRef()
+    public void SetDefaultLoader(System.Func<string, ByteBuf> loader)
     {
-        TbItem.ResolveRef(this);
+        defaultLoader = null;
-        TbActorConfig.ResolveRef(this);
+        defaultLoader = loader;
-        TbGiftConfig.ResolveRef(this);
-        TbTeamConfig.ResolveRef(this);
-        TbSystemConfig.ResolveRef(this);
-        TbPlayerLevelConfig.ResolveRef(this);
     }
+
+    //public partial void Init();
+
+    public void Init(){}
 }
 
 }

UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/teamConfig/TeamConfig.cs

@@ -19,9 +19,9 @@ public sealed partial class TeamConfig : Luban.BeanBase
         Id = _buf.ReadInt();
         Name = _buf.ReadString();
         Desc = _buf.ReadString();
-        Radius = _buf.ReadFloat();
+        ScoreValue = _buf.ReadFloat();
-        MaxTeamHp = _buf.ReadFloat();
+        ScoreTargetValue = _buf.ReadInt();
-        LevelUpExp = _buf.ReadInt();
+        OneScoreTargetValue = _buf.ReadInt();
     }
 
     public static TeamConfig DeserializeTeamConfig(ByteBuf _buf)
@@ -42,17 +42,17 @@ public sealed partial class TeamConfig : Luban.BeanBase
     /// </summary>
     public readonly string Desc;
     /// <summary>
-    /// 半径
+    /// 积分倍率
     /// </summary>
-    public readonly float Radius;
+    public readonly float ScoreValue;
     /// <summary>
-    /// 最大血量
+    /// 要求积分
     /// </summary>
-    public readonly float MaxTeamHp;
+    public readonly int ScoreTargetValue;
     /// <summary>
-    /// 升级所需经验
+    /// 个人算力形象要求
     /// </summary>
-    public readonly int LevelUpExp;
+    public readonly int OneScoreTargetValue;
    
     public const int __ID__ = -325757586;
     public override int GetTypeId() => __ID__;
@@ -67,9 +67,9 @@ public sealed partial class TeamConfig : Luban.BeanBase
         + "id:" + Id + ","
         + "name:" + Name + ","
         + "desc:" + Desc + ","
-        + "Radius:" + Radius + ","
+        + "ScoreValue:" + ScoreValue + ","
-        + "MaxTeamHp:" + MaxTeamHp + ","
+        + "ScoreTargetValue:" + ScoreTargetValue + ","
-        + "LevelUpExp:" + LevelUpExp + ","
+        + "OneScoreTargetValue:" + OneScoreTargetValue + ","
         + "}";
     }
 }