修改编译相关问题

DotNet/Model/Generate/Message/OuterMessage_C_10001.cs

@@ -559,6 +559,40 @@ namespace ET
 
 	}
 
+	[ResponseType(nameof(G2C_TriggrBattleFunction))]
+	[Message(OuterMessage.C2G_TriggrBattleFunction)]
+	[ProtoContract]
+	public partial class C2G_TriggrBattleFunction: ProtoObject, IActorLocationRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int EffectID { get; set; }
+
+		[ProtoMember(3)]
+		public int Value { get; set; }
+
+		[ProtoMember(4)]
+		public int Time { get; set; }
+
+	}
+
+	[Message(OuterMessage.G2C_TriggrBattleFunction)]
+	[ProtoContract]
+	public partial class G2C_TriggrBattleFunction: ProtoObject, IActorLocationResponse
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
+	}
+
 	[Message(OuterMessage.G2C_TestHotfixMessage)]
 	[ProtoContract]
 	public partial class G2C_TestHotfixMessage: ProtoObject, IMessage
@@ -678,11 +712,13 @@ namespace ET
 		 public const ushort G2C_AddUnitsToMap = 10036;
 		 public const ushort C2G_RemoveUnit = 10037;
 		 public const ushort G2C_RemoveUnit = 10038;
-		 public const ushort G2C_TestHotfixMessage = 10039;
-		 public const ushort C2M_TestRobotCase = 10040;
-		 public const ushort M2C_TestRobotCase = 10041;
-		 public const ushort C2G_Benchmark = 10042;
-		 public const ushort G2C_Benchmark = 10043;
-		 public const ushort R2C_Disconnect = 10044;
+		 public const ushort C2G_TriggrBattleFunction = 10039;
+		 public const ushort G2C_TriggrBattleFunction = 10040;
+		 public const ushort G2C_TestHotfixMessage = 10041;
+		 public const ushort C2M_TestRobotCase = 10042;
+		 public const ushort M2C_TestRobotCase = 10043;
+		 public const ushort C2G_Benchmark = 10044;
+		 public const ushort G2C_Benchmark = 10045;
+		 public const ushort R2C_Disconnect = 10046;
 	}
 }

Unity/Assets/Res/CodeDll/Unity.Mono.pdb.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: db32b785f4abfcd4a89eeac64251e081
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unity/Assets/Scripts/Codes/HotfixView/Client/Opera/OperaComponentSystem.cs

@@ -40,8 +40,8 @@ namespace ET.Client
 
                 if (Input.GetKeyDown(KeyCode.T))
                 {
-                    C2M_TransferMap c2MTransferMap = new C2M_TransferMap();
-                    self.ClientScene().GetComponent<SessionComponent>().Session.Call(c2MTransferMap).Coroutine();
+                    //C2M_TransferMap c2MTransferMap = new C2M_TransferMap();
+                    //self.ClientScene().GetComponent<SessionComponent>().Session.Call(c2MTransferMap).Coroutine();
                 }
             }
         }

Unity/Assets/Scripts/Codes/Model/Client/Battle/BattleDefine.cs

@@ -16,3 +16,47 @@ public enum UnitHitEventState
     //上面的值跟XmdsCommonServer.Plugin.XmdsVirtual.UnitHitEventState是一一对应的
     PoisonBuff = 100,   //奶妈毒BUFF
 }
+
+//暂时用byte, 子状态可能同时拥有多个是A + B + C的组合值
+public enum UnitActionSubStatus : int
+{
+    None = 0,
+    Stealth = 1 << 0,               // 隐身
+    ChargeAtkIdle = 1 << 1,             // 蓄力空闲
+    CanNotMove = 1 << 2,                // 不能移动
+    Mocking = 1 << 3,               // 嘲讽状态
+    ChargeAtkMove = 1 << 4,             // 蓄力移动
+}
+
+public enum SkillActiveState : byte
+{
+    Active = 0,
+    Deactive = 1,
+    DeactiveAndPause = 2,
+    Hide = 3,
+    ActiveAndHide = 4,
+}
+
+public enum XmdsSkillType : byte
+{
+    none = 0,        // 啥也不是，默认值         
+    active = 1,        //主动攻击技能.
+    petGiveAcitve = 2,        //宠物给人的主动技能
+    normalAtk = 3,        //普通攻击.
+    passive = 4,        //被动技能.
+    petGivePassive = 5,        //宠物给玩家的被动技能
+    cardSkill = 6,      //卡牌技能
+}
+
+//新增动作类型
+public enum ActionEnum : byte
+{
+    None = 0,
+    //蓄力, 后续动作会在前一个动作播放完成之后，自动播放下一段(跟IsSinleAction不同的是，这个可指定部分序列帧的连续性)
+    chargeAtk = 1,          //这个客户端需要显示圈
+    IsAutoNext = 2,         //这个客户端不需要显示圈
+    forbidNext = 3,            //actionQueue在有多段的时候，禁止下一段（适用某个技能多种形态）
+    forbidNext_lock = 4,            //同上，只不过next被锁定，不能自动释放，只能有代码控制（比如法师剑影）        
+    showLeftTime = 5,            //使用当前动作时间作为CD
+    forbidNext_showTime = 6,            //forbidNext + 显示倒计时圈
+}

Unity/Assets/Scripts/Codes/Model/Client/Generate/Message/OuterMessage_C_10001.cs

@@ -491,31 +491,62 @@ namespace ET
 
 	}
 
-	[Message(OuterMessage.G2C_TestHotfixMessage)]
+	[ResponseType(nameof(G2C_AddUnitsToMap))]
+	[Message(OuterMessage.C2G_AddUnitsToMap)]
 	[ProtoContract]
-	public partial class G2C_TestHotfixMessage: ProtoObject, IMessage
+	public partial class C2G_AddUnitsToMap: ProtoObject, IActorLocationRequest
 	{
 		[ProtoMember(1)]
-		public string Info { get; set; }
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int UnitId { get; set; }
+
+		[ProtoMember(3)]
+		public int Force { get; set; }
+
+		[ProtoMember(4)]
+		public string Flag { get; set; }
+
+		[ProtoMember(5)]
+		public int X { get; set; }
+
+		[ProtoMember(6)]
+		public int Y { get; set; }
 
 	}
 
-	[ResponseType(nameof(M2C_TestRobotCase))]
-	[Message(OuterMessage.C2M_TestRobotCase)]
+	[Message(OuterMessage.G2C_AddUnitsToMap)]
 	[ProtoContract]
-	public partial class C2M_TestRobotCase: ProtoObject, IActorLocationRequest
+	public partial class G2C_AddUnitsToMap: ProtoObject, IActorLocationResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
 		[ProtoMember(2)]
-		public int N { get; set; }
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
 
 	}
 
-	[Message(OuterMessage.M2C_TestRobotCase)]
+	[ResponseType(nameof(G2C_RemoveUnit))]
+	[Message(OuterMessage.C2G_RemoveUnit)]
 	[ProtoContract]
-	public partial class M2C_TestRobotCase: ProtoObject, IActorLocationResponse
+	public partial class C2G_RemoveUnit: ProtoObject, IActorLocationRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int UnitId { get; set; }
+
+	}
+
+	[Message(OuterMessage.G2C_RemoveUnit)]
+	[ProtoContract]
+	public partial class G2C_RemoveUnit: ProtoObject, IActorLocationResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -526,24 +557,67 @@ namespace ET
 		[ProtoMember(3)]
 		public string Message { get; set; }
 
+	}
+
+	[ResponseType(nameof(G2C_TriggrBattleFunction))]
+	[Message(OuterMessage.C2G_TriggrBattleFunction)]
+	[ProtoContract]
+	public partial class C2G_TriggrBattleFunction: ProtoObject, IActorLocationRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int EffectID { get; set; }
+
+		[ProtoMember(3)]
+		public int Value { get; set; }
+
 		[ProtoMember(4)]
-		public int N { get; set; }
+		public int Time { get; set; }
 
 	}
 
-	[ResponseType(nameof(M2C_TransferMap))]
-	[Message(OuterMessage.C2M_TransferMap)]
+	[Message(OuterMessage.G2C_TriggrBattleFunction)]
 	[ProtoContract]
-	public partial class C2M_TransferMap: ProtoObject, IActorLocationRequest
+	public partial class G2C_TriggrBattleFunction: ProtoObject, IActorLocationResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
 
+		[ProtoMember(2)]
+		public int Error { get; set; }
+
+		[ProtoMember(3)]
+		public string Message { get; set; }
+
 	}
 
-	[Message(OuterMessage.M2C_TransferMap)]
+	[Message(OuterMessage.G2C_TestHotfixMessage)]
 	[ProtoContract]
-	public partial class M2C_TransferMap: ProtoObject, IActorLocationResponse
+	public partial class G2C_TestHotfixMessage: ProtoObject, IMessage
+	{
+		[ProtoMember(1)]
+		public string Info { get; set; }
+
+	}
+
+	[ResponseType(nameof(M2C_TestRobotCase))]
+	[Message(OuterMessage.C2M_TestRobotCase)]
+	[ProtoContract]
+	public partial class C2M_TestRobotCase: ProtoObject, IActorLocationRequest
+	{
+		[ProtoMember(1)]
+		public int RpcId { get; set; }
+
+		[ProtoMember(2)]
+		public int N { get; set; }
+
+	}
+
+	[Message(OuterMessage.M2C_TestRobotCase)]
+	[ProtoContract]
+	public partial class M2C_TestRobotCase: ProtoObject, IActorLocationResponse
 	{
 		[ProtoMember(1)]
 		public int RpcId { get; set; }
@@ -554,6 +628,9 @@ namespace ET
 		[ProtoMember(3)]
 		public string Message { get; set; }
 
+		[ProtoMember(4)]
+		public int N { get; set; }
+
 	}
 
 	[ResponseType(nameof(G2C_Benchmark))]
@@ -631,13 +708,17 @@ namespace ET
 		 public const ushort G2C_CreatePlayer = 10032;
 		 public const ushort C2G_BindPlayer = 10033;
 		 public const ushort G2C_BindPlayer = 10034;
-		 public const ushort G2C_TestHotfixMessage = 10035;
-		 public const ushort C2M_TestRobotCase = 10036;
-		 public const ushort M2C_TestRobotCase = 10037;
-		 public const ushort C2M_TransferMap = 10038;
-		 public const ushort M2C_TransferMap = 10039;
-		 public const ushort C2G_Benchmark = 10040;
-		 public const ushort G2C_Benchmark = 10041;
-		 public const ushort R2C_Disconnect = 10042;
+		 public const ushort C2G_AddUnitsToMap = 10035;
+		 public const ushort G2C_AddUnitsToMap = 10036;
+		 public const ushort C2G_RemoveUnit = 10037;
+		 public const ushort G2C_RemoveUnit = 10038;
+		 public const ushort C2G_TriggrBattleFunction = 10039;
+		 public const ushort G2C_TriggrBattleFunction = 10040;
+		 public const ushort G2C_TestHotfixMessage = 10041;
+		 public const ushort C2M_TestRobotCase = 10042;
+		 public const ushort M2C_TestRobotCase = 10043;
+		 public const ushort C2G_Benchmark = 10044;
+		 public const ushort G2C_Benchmark = 10045;
+		 public const ushort R2C_Disconnect = 10046;
 	}
 }