Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	UserSettings/EditorUserSettings.asset   resolved by origin/master(远端) version

Assets/Art/Character/Guaiwu/LaoShuGuai/shuguaicz.mat

@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.20543575
+    - _Alpha: 0.2542529
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.2055955
+    - _MainTexOffsetU: 0.1489439
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Art/shader/RenWuShader.shadergraph

@@ -3611,8 +3611,8 @@
     "m_CustomSlotLabel": "",
     "m_DismissedVersion": 0,
     "m_Precision": 0,
-    "overrideHLSLDeclaration": false,
-    "hlslDeclarationOverride": 0,
+    "overrideHLSLDeclaration": true,
+    "hlslDeclarationOverride": 3,
     "m_Hidden": false,
     "m_Priority": 10,
     "m_Value": {
@@ -3622,7 +3622,7 @@
         "a": 0.0
     },
     "isMainColor": false,
-    "m_ColorMode": 1
+    "m_ColorMode": 0
 }
 
 {

Assets/Scripts/Core/BRG/BRGRender.cs

@@ -3,6 +3,7 @@ using Unity.Collections;
 using Unity.Mathematics;
 using UnityEngine;
 using UnityEngine.Rendering;
+using Utility;
 
 namespace Core.BRG
 {
@@ -20,6 +21,8 @@ namespace Core.BRG
 
         private List<BatchShaderBind> m_batchShaderBinds = new List<BatchShaderBind>();
 
+        private Map<string, BatchShaderBind> m_batchShaderBindMap = new Map<string, BatchShaderBind>();
+
         public void InitRender(BRGSamples samples, List<T> gameObjectInfos)
         {
             this.m_gameObjectInfos = gameObjectInfos;
@@ -29,23 +32,29 @@ namespace Core.BRG
             UploadGpuData(gameObjectInfos.Count);
         }
 
-        protected override NativeArray<MetadataValue> ProInitBatchMetadata(int startOffset,int m_maxInstancePerWindow)
+        protected override NativeArray<MetadataValue> ProInitBatchMetadata(int startOffset, int m_maxInstancePerWindow)
         {
             NativeArray<MetadataValue> metadataValues =
-                new NativeArray<MetadataValue>(m_samples.AllShaderValues.Count,Allocator.Temp, NativeArrayOptions.UninitializedMemory);
+                new NativeArray<MetadataValue>(m_samples.AllShaderValues.Count, Allocator.Temp,
+                    NativeArrayOptions.UninitializedMemory);
             m_batchShaderBinds.Clear();
-            int count= m_gameObjectInfos.Count;
+            // int count= m_maxInstancePerWindow;
             for (int i = 0; i < m_samples.AllShaderValues.Count; i++)
             {
-                // BRGShaderValue shaderValue = m_samples.AllShaderValues[i];
-                // int shaderId = Shader.PropertyToID(shaderValue.);
-                // BatchShaderBind batchShaderBind = new BatchShaderBind();
-                // batchMetadata[0] = CreateMetadataValue(objectToWorldID, 0, true);
+                BRGShaderValue shaderValue = m_samples.AllShaderValues[i];
+                int shaderId = Shader.PropertyToID(shaderValue.key);
+                BatchShaderBind batchShaderBind = new BatchShaderBind();
+                metadataValues[i] = CreateMetadataValue(shaderId, startOffset, true);
+                batchShaderBind.shaderValue = shaderValue;
+                batchShaderBind.offset = startOffset;
+                batchShaderBind.InitBuffer(m_maxInstancePerWindow);
+                startOffset += shaderValue.GetSize() * m_maxInstancePerWindow;
+                m_batchShaderBinds.Add(batchShaderBind);
+                m_batchShaderBindMap.Add(shaderValue.key, batchShaderBind);
             }
-            return base.ProInitBatchMetadata(startOffset,m_maxInstancePerWindow);
-        }
 
-      
+            return metadataValues;
+        }
 
 
         public void UpdatePos()
@@ -68,6 +77,7 @@ namespace Core.BRG
             }
 
             int m_itemCount = m_gameObjectInfos.Count;
+            m_batchShaderBindMap.TryGetValue("_MainColor", out var baseColorBind);
             for (int i = 0; i < m_gameObjectInfos.Count; i++)
             {
                 BGRGameObjectInfo info = m_gameObjectInfos[i];
@@ -86,10 +96,14 @@ namespace Core.BRG
                     inverse.c0.xyz, inverse.c1.xyz,
                     inverse.c2.xyz, inverse.c3.xyz
                 );
+                if (baseColorBind != null)
+                {
+                    baseColorBind.SetData(i, info.color);
+                }
             }
 
             // 每帧更新后重新上传数据到GPU
-            UploadTransformData(m_itemCount);
+            UploadGpuData(m_itemCount, m_batchShaderBinds);
         }
     }
 }

Assets/Scripts/Core/BRG/BatchShaderBind.cs

@@ -17,7 +17,7 @@ namespace Core.BRG
         private int _count;
         private int _size;
 
-        private void InitBuffer(int count)
+        public void InitBuffer(int count)
         {
             this._count = count;
             _size = shaderValue.GetSize();
@@ -38,9 +38,25 @@ namespace Core.BRG
             }
         }
 
+        public void SetData(int index, float4 data)
+        {
+            _f4Buffer[index] = data;
+        }
+        public void SetData(int index, float4x4 data)
+        {
+            _f4x4Buffer[index] = data;
+        }
+        public void SetData(int index, float3x4 data)
+        {
+            _f3x4Buffer[index] = data;
+        }
+        public void SetData(int index, float data)
+        {
+            _f1Buffer[index] = data;
+        }
         public void SetData(GraphicsBuffer graphicsBuffer)
         {
-            InitBuffer(graphicsBuffer.count);
+            // IitBuffer(graphicsBuffer.count);
             switch (shaderValue.ValueType)
             {
                 case BRGShaderValueType.F4X4:

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -198,6 +198,7 @@ namespace GameLogic.Combat.CombatType
                         // entity.MaxCombatHeroInfo.hp = (EncryptionLong)(20000);
                         combatController.CombatHeroController.AddHero(entity);
                         CombatController.currActiveCombat.playerHeroEntity = heroEntity;
+                        entity.heroMagicWeaponControl.isAutoUse = _startCombatInfo.isAutoCombat;
                     }, isPlayer: true));
             }
             else
@@ -215,6 +216,7 @@ namespace GameLogic.Combat.CombatType
                         // entity.MaxCombatHeroInfo.hp = (EncryptionLong)(20000);
                         combatController.CombatHeroController.AddHero(entity);
                         CombatController.currActiveCombat.playerHeroEntity = heroEntity;
+                        entity.heroMagicWeaponControl.isAutoUse = _startCombatInfo.isAutoCombat;
                     }, isPlayer: true));
             }
         }

Assets/Scripts/GameLogic/Combat/CombatType/StartCombatInfo.cs

@@ -10,6 +10,7 @@
         public bool isCombatOverUi;
 
         public int monsterLevel;
+        public bool isAutoCombat;
 
     }
 }

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -157,6 +157,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public bool isTriggerDone = false;
         public List<int> phaseKey = new List<int>();
         public List<int> phaseValue = new List<int>();
+        public bool isAutoCombat;
     }
     [System.Serializable]
     public class RedDot

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -77,6 +77,7 @@ namespace GameLogic.Combat
             startCombatInfo.isCombatOverUi = isCombatOverUi;
             startCombatInfo.monsterLevel = level;
             startCombatInfo.levelBattleId= levelBattleId;
+            startCombatInfo.isAutoCombat = AccountFileInfo.Instance.playerData.isAutoCombat;
             await StartCombat(startCombatInfo);
 
             LevelBattleCombatType levelBattleCombatType = CombatController.CombatTypeBasic as LevelBattleCombatType;

Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs

@@ -180,8 +180,10 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             CameraSelect.onValueChanged.AddListener(CameraSelect_onValueChanged);
+            AutoUse.isOn=CombatController.currActiveCombat.playerHeroEntity.heroMagicWeaponControl.isAutoUse;
             AutoUse.onValueChanged.AddListener((x) =>
             {
+                AccountFileInfo.Instance.playerData.isAutoCombat = x;
                 CombatController.currActiveCombat.playerHeroEntity.heroMagicWeaponControl.isAutoUse =
                     x;
             });

UserSettings/EditorUserSettings.asset

@@ -21,46 +21,46 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 5402055e50575f5d0f5e54711173084444154f7e2f7a24657e2b1837b7b56669
+      value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 0050025706050c5d5f0c58274673074417161b72782977637e7b4c6bb1e6606e
+      value: 53520353570c0b5d0c5a0d2141755e44104e4a297d7c7762792d4a61bbb6613c
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
+      value: 525456020100515e5d5f087145710844404f1c797d2e7262752d4b67b0b6373e
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 53520353570c0b5d0c5a0d2141755e44104e4a297d7c7762792d4a61bbb6613c
+      value: 060255045d5150585957587212750944444f412c2e7c20342c7b4c67e3b26d60
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 525456020100515e5d5f087145710844404f1c797d2e7262752d4b67b0b6373e
+      value: 545007550304585a545d5e76157b0844454f1b7a2d2c7666782f4961b7b9623b
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 060255045d5150585957587212750944444f412c2e7c20342c7b4c67e3b26d60
+      value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 545007550304585a545d5e76157b0844454f1b7a2d2c7666782f4961b7b9623b
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
+      value: 5009075552535a5d5b565c2446260844401548287a7d743674704963e1e1673c
       flags: 0
     RecentlyUsedSceneGuid-8:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 540803075206595a085d5c7241260e4415164b722a2922647d2a4a62e6b3676c
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b4968e8ff0a2a4a0bcabada5f4a3ffffa58ce8a2c182a6d8c2869bd1f5dc8e9c9b97ea9c8183ee8383868b83dd8181de888c95cfb9cff8c4f7f0ddf1f4c6c5f6c9feccc9c9e538e2b27d
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd88908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c928797a7cf
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b9859884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec879c8395949c9483d68a8d97ddf0ddf2c1f2f6c6f9f3ceccf5cfb68083
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b9859884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec879c8395949c9483d68a8d97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd3c3e302a07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd88908fecb0f9cfddf1eff4e7a1b1eae482f0fca9e5e19297949199e7919d919c90e2839d91a79188878f83cb8689d7888889d8f1daf7c7fff58ebc
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b7968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af9f8aaffff8e85dd8390e392998899daa7
       flags: 0
     UnityEditor.ShaderGraph.ToggleSettings:
       value: 18135d1527590858060c032302276919051e1a26296a7c243f3c187fa0e92708f0e220e0e22d09352a0bed30017c5b2be01f0c47b40219221f1ded0b12eb1f0127cc0bcc18c41a5e910d0edbc85193e0dadadbf8e8f9e8ced7dba5e0b6aaaca4dbfeabfef4eae1