瀏覽代碼

删除无用代码
还原主播角色技能
修复特效EffectHight在BindBody为true时,不起效果的问题

大爷 1 年之前
父節點
當前提交
56e16864f0

+ 2 - 2
DotNet/Hotfix/Scenes/Game/Player/PlayerSystem.cs

@@ -227,7 +227,7 @@ namespace ET.Server
                 // skills = self.ToJson4BattleServerSkillInfos,
                 skills = new List<SkillInfo>()
                 {
-                    /*new SkillInfo
+                    new SkillInfo
                     {
                         id = 510200,
                         level = 1,
@@ -237,7 +237,7 @@ namespace ET.Server
                         flag = 0,
                         autoLaunch = false,
                     },
-                    new SkillInfo
+                    /*new SkillInfo
                     {
                         id = 90203,
                         level = 1,

+ 3 - 5
Unity/Assets/Scripts/Codes/Hotfix/Client/battle/BattlePushHandler.cs

@@ -13,16 +13,14 @@ namespace ET.Client
     {
         protected override async ETTask Run(Session session, BattleEventPush pushdata)
         {
-            var type = pushdata.key;
+            //var type = pushdata.key;
             //Log.Debug($"<<receive battle push type({type})");
 
-            object data;
-            if(!BattleResourceMgr.Instance.BattleMsgDecoder.doDecode(new MemoryStream(pushdata.data), out data))
+            if (!BattleResourceMgr.Instance.BattleMsgDecoder.doDecode(new MemoryStream(pushdata.data), out object data))
             {
                 return;
             }
-            var msg = data as CommonLang.Protocol.IMessage;
-            BattleMgr.Instance.Layer.ProcessMessage(msg);
+            BattleMgr.Instance.Layer.ProcessMessage(data as CommonLang.Protocol.IMessage);
 
             /*if ((ushort)BattlePushCnst.FastStreamPush == type)
             {

+ 1 - 1
Unity/Assets/Scripts/Codes/HotfixView/Client/Effect/EffectMgr.cs

@@ -194,7 +194,7 @@ namespace ET.Client
                 {
                     gt.parent = render.GameObject.transform;
                 }
-                vecTemp.Set(effectData.EffectOffsetX, 0, effectData.EffectOffsetY);
+                vecTemp.Set(effectData.EffectOffsetX, effectData.EffectHight, effectData.EffectOffsetY);
                 gt.localPosition = vecTemp;
                 if (effectData.Tag == "FixStartRotaion")
                 {

+ 0 - 31
Unity/Assets/Scripts/Codes/HotfixView/Client/Unit/MoveStart_StartAnimation.cs

@@ -1,31 +0,0 @@
-//TODO: DELETE
-
-/*using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace ET.Client
-{
-    [Event(SceneType.Current)]
-    public class MoveStart_StartAnimation : AEvent<EventType.MoveStart>
-    {
-        protected override async ETTask Run(Scene scene, EventType.MoveStart args)
-        {
-            Unit unit = args.Unit;
-            unit.GetComponent<AnimatorComponent>().AppendCommand(AnimatorComponent.CMDRun);
-            await ETTask.CompletedTask;
-        }
-    }
-
-    [Event(SceneType.Current)]
-    public class MoveStop_StartAnimation : AEvent<EventType.MoveStop>
-    {
-        protected override async ETTask Run(Scene scene, EventType.MoveStop args)
-        {
-            Unit unit = args.Unit;
-            unit.GetComponent<AnimatorComponent>().AppendCommand(AnimatorComponent.CMDStopRun);
-            await ETTask.CompletedTask;
-        }
-    }
-}
-*/

+ 0 - 11
Unity/Assets/Scripts/Codes/HotfixView/Client/Unit/MoveStart_StartAnimation.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d947071d2bdee0341ae88741675d1435
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: