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

# Conflicts:
#	Assets/Res/Config/ReddotConfig.json   resolved by master version

Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.3
+    - _MainTexOffsetV: 0.25601506
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

Assets/Res/Config/EventConfig.json

@@ -2913,6 +2913,12 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
+      "PrizeIDs": [
+        20004
+      ],
+      "PrizeNums": [
+        1
+      ],
       "RefreshProbability": 30,
       "RefreshCount": 1,
       "placeID": 2,

Assets/Res/UIAtlas/battle.spriteatlasv2.meta

@@ -20,12 +20,12 @@ SpriteAtlasImporter:
     padding: 4
     blockOffset: 1
     allowAlphaSplitting: 0
-    enableRotation: 0
-    enableTightPacking: 0
-    enableAlphaDilation: 1
+    enableRotation: 1
+    enableTightPacking: 1
+    enableAlphaDilation: 0
   secondaryTextureSettings: {}
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: battle
+  assetBundleName: 
   assetBundleVariant: 

Assets/Scripts/Core/BRG/BRGRender.cs

@@ -45,11 +45,6 @@ namespace Core.BRG
                 new NativeArray<MetadataValue>(m_samples.AllShaderValues.Count, Allocator.Temp,
                     NativeArrayOptions.UninitializedMemory);
             m_batchShaderBinds.Clear();
-            // BatchShaderBind transformBind = new BatchShaderBind();
-            // transformBind.shaderValue = new BRGShaderValue()
-            // {
-            //     key = "_Object2World",
-            // };
             for (int i = 0; i < m_samples.AllShaderValues.Count; i++)
             {
                 BRGShaderValue shaderValue = m_samples.AllShaderValues[i];

Assets/Scripts/GameLogic/Combat/Skill/S2009.cs

@@ -7,6 +7,7 @@ using GameLogic.Combat.Hero;
 
 namespace GameLogic.Combat.Skill
 {
+    
     /// <summary>
     /// 青莲净体诀  前方槽位功法在命中目标时会获得青莲之气，青莲气体达到{0}层时清除自己{1}个随机debuff,并恢复{2}%最大生命
     /// 后方槽位也能获得青莲之气

Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs

@@ -623,6 +623,11 @@ namespace GameLogic.Combat.Skill
             {
                 int configIndex = (int)SelfSkillConfig.PromoteLanPara_1[i];
                 int currIndex = (configIndex + index) % 10;
+                if (currIndex < 0)
+                {
+                    currIndex = currIndex + 10;
+                }
+
                 if (targetSkillBasic.index == currIndex)
                 {
                     return true;

Assets/Scripts/GameLogic/Hero/SkillInfo.cs

@@ -102,7 +102,8 @@ namespace GameLogic.Hero
                     // int index = skillConfig.intensifierIndex[i] ;
                     if (index >= 0 && index < effectValue.Length)
                     {
-                        effectValue[index] = effectValue[index] * SkillPowerupConfig.SkillPower1 * 0.01f;
+                        float value = 100+(SkillPowerupConfig.SkillPower1 - 100) * skillConfig.effectUpK * 0.01f;
+                        effectValue[index] = effectValue[index] * value * 0.01f;
                     }
                 }
             }

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5650035003045b5e5a0a082141265944464f4f7f2e7b233629714831e0e6636c
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5650035003045b5e5a0a082141265944464f4f7f2e7b233629714831e0e6636c
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615