DESKTOP-BGJIU14\ck 1 napja
szülő
commit
a0469c3857

+ 1 - 0
Assets/Res/CombatScenes/LevelBattle01.prefab

@@ -77,6 +77,7 @@ MonoBehaviour:
       maxY: -10
       prefab: {fileID: 7123144361424570747, guid: 8af965d3c361bfc4c9fdcd7b85c19600, type: 3}
   skyObejct: {fileID: 8635193522516608795}
+  shengShiMaterial: {fileID: 2100000, guid: 5d9d871e58f5c1b4890049c6625f29c8, type: 2}
 --- !u!1001 &881047069771566859
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 1 - 0
Assets/Res/CombatScenes/LevelBattle02.prefab

@@ -74,6 +74,7 @@ MonoBehaviour:
     maxCount: 0
     SceneObjectConfigs: []
   skyObejct: {fileID: 1381729068282112590}
+  shengShiMaterial: {fileID: 2100000, guid: 5d9d871e58f5c1b4890049c6625f29c8, type: 2}
 --- !u!1001 &3986193909677313104
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 4 - 1
Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -61,7 +61,10 @@ Material:
     - _QueueControl: 0
     - _QueueOffset: 0
     - _depthoff: 1.18
-    - _qiangdu: 400
+    - _qiangdu: 4
+    - _ran: 0.1
     m_Colors:
+    - _mainColor: {r: 0.1196062, g: 1.0562625, b: 2.3051374, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
+    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
   m_BuildTextureStacks: []

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 738 - 75
Assets/Resources/Shader/ShengShiShader.shadergraph


+ 27 - 16
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/CombatSenceController.cs

@@ -13,6 +13,8 @@ namespace GameLogic.Combat.CombatTool
 {
     public class CombatSenceController : IDisposable
     {
+        private static readonly int Ran = Shader.PropertyToID("_ran");
+        private static readonly int Pos = Shader.PropertyToID("_pos");
         public CombatSencePath currBesselPath;
 
         public CombatSencePath NextBesselPath;
@@ -27,17 +29,18 @@ namespace GameLogic.Combat.CombatTool
 
         private List<CombatSencePath> reclaimSence = new List<CombatSencePath>();
 
-        protected GameObjectPool ShengShiQiuTi;
+        // protected GameObjectPool ShengShiQiuTi;
 
         private float shengShiStartSize = 3;
         private float shengShiEndSize = 300;
-        private float _shengShiAddTime;
+        // private float _shengShiAddTime;
         private bool _isUpdateShengShi;
 
         private SceneMonoConfig SceneMonoConfig;
 
         private RandomAllMap RandomAllMap;
 
+        private float shengShiRan;
         // private List
         public async CTask InitScenes()
         {
@@ -51,13 +54,14 @@ namespace GameLogic.Combat.CombatTool
                 {
                     GameObject gameObject = assetHandle.AssetObject<GameObject>();
                     SceneMonoConfig = gameObject.GetComponent<SceneMonoConfig>();
+                    SceneMonoConfig.shengShiMaterial.SetFloat(Ran,0.1f); 
                 });
             cTaskAwaitBuffer.AddTask(task_a);
 
-            ShengShiQiuTi =
-                await GObjectPool.Instance.FetchAsync<GameObjectPool>("ShengShiQiuTi", null, null, false,
-                    "ShengShiQiuTi");
-            ShengShiQiuTi.SetActive(false);
+            // ShengShiQiuTi =
+            //     await GObjectPool.Instance.FetchAsync<GameObjectPool>("ShengShiQiuTi", null, null, false,
+            //         "ShengShiQiuTi");
+            // ShengShiQiuTi.SetActive(false);
             lasetDir = Vector3.forward;
             lasetPos = new Vector3(0, 20, 0);
             await cTaskAwaitBuffer.WaitAll();
@@ -291,12 +295,16 @@ namespace GameLogic.Combat.CombatTool
 
         public void StartPayShengShi(Transform root)
         {
-            ShengShiQiuTi.own.transform.SetParent(root);
-            ShengShiQiuTi.own.transform.localPosition = Vector3.zero;
-            ShengShiQiuTi.SetActive(true);
+            shengShiRan = 1;
+            SceneMonoConfig.shengShiMaterial.SetFloat(Ran,shengShiRan); 
+           Vector3 pos= CombatController.currActiveCombat.playerHeroEntity.dotPos - CombatController.currActiveCombat
+                .CombatCameraControllder.Camera.transform.position;
+           pos.z = -30;
+           SceneMonoConfig.shengShiMaterial.SetVector(Pos,pos); 
+           
             _isUpdateShengShi = true;
-            ShengShiQiuTi.own.transform.localScale = Vector3.one * shengShiStartSize;
-            _shengShiAddTime = 0;
+        
+            // _shengShiAddTime = 0;
         }
 
         public void Update(float t)
@@ -319,12 +327,15 @@ namespace GameLogic.Combat.CombatTool
 
             if (_isUpdateShengShi)
             {
-                _shengShiAddTime += t * 1f;
-                float v = Mathf.Lerp(shengShiStartSize, shengShiEndSize, _shengShiAddTime);
-                ShengShiQiuTi.own.transform.localScale = Vector3.one * v;
-                if (_shengShiAddTime >= 1)
+                // _shengShiAddTime += t * 1f;
+                shengShiRan += t * 150;
+                SceneMonoConfig.shengShiMaterial.SetFloat(Ran,shengShiRan); 
+                // float v = Mathf.Lerp(shengShiStartSize, shengShiEndSize, _shengShiAddTime);
+                // ShengShiQiuTi.own.transform.localScale = Vector3.one * v;
+                if (shengShiRan >= 180)
                 {
-                    ShengShiQiuTi.SetActive(false);
+                    SceneMonoConfig.shengShiMaterial.SetFloat(Ran,0.1f); 
+                    
                     _isUpdateShengShi = false;
                 }
             }

+ 1 - 1
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/RandomAllMap.cs

@@ -47,7 +47,7 @@ namespace GameLogic.Combat.CombatTool.SceneTool
             float zStartInit = z;
             for (int i = -3; i <= 3; i++)
             {
-                for (int j = -3; j <= 3; j++)
+                for (int j = -3; j <= 4; j++)
                 {
                     // if (i == 0 && j == 0)
                     // {

+ 1 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs

@@ -14,6 +14,7 @@ namespace GameLogic.Combat.CombatTool.SceneTool
 
         public GameObject skyObejct;
 
+        public Material shengShiMaterial;
         private Transform root;
 
         public void Init(Transform root)

+ 1 - 1
Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -171,7 +171,7 @@ namespace Fort23.Mono
             CombatController.currActiveCombat.CombatSenceController.StartPayShengShi(CombatController.currActiveCombat
                 .playerHeroEntity.GameObject.transform);
             List<AccountFileInfo.EventList> eventLists = EventSystemManager.Instance.UseDivinesense(count, useItems);
-            await TimerComponent.Instance.WaitAsync(800);
+            await TimerComponent.Instance.WaitAsync(1200);
             EventSystemManager.Instance.isTriggerEvent = false;
             if (eventLists == null || eventLists.Count == 0)
             {

+ 1 - 1
Assets/Settings/rpAsset_Renderer.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e03bbffa856b4d149b49c5ff90f72fb6, type: 3}
   m_Name: Blit
   m_EditorClassIdentifier: 
-  m_Active: 0
+  m_Active: 1
   settings:
     Event: 500
     blitMaterial: {fileID: 2100000, guid: 5d9d871e58f5c1b4890049c6625f29c8, type: 2}

+ 1 - 1
UserSettings/EditorUserSettings.asset

@@ -60,7 +60,7 @@ EditorUserSettings:
       value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec879c8395949c9483d68a8d97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a560393d3511ea7046333e09f7181d02f50a06241708ee0b05bd4a435f95548717f73713d91006c1c309d0effad0d2f9ddffa5828791f0beb6fdd1cbfceba0b9f0b3bed8e8f5ade6fb8c978883d3f59e98909c89eacfcc
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd88908fecb0f9cfddf1eff4e7a1b1eae482f0fca9e5e1928b86d888ed909a938797a7cf
       flags: 0
     UnityEditor.ShaderGraph.ToggleSettings:
       value: 18135d1527590858060c032302276919051e1a26296a7c243f3c187fa0e92708f0e220e0e22d09352a0bed30017c5b2be01f0c47b40219221f1ded0b12eb1f0127cc0bcc18c41a5e910d0edbc85193e0dadadbf8e8f9e8ced7dba5e0b6aaaca4dbfeabfef4eae1

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott