Переглянути джерело

增加编辑器Unit属性PreloadResources,用于客户端预加载单位相关资源。
删除无用的ChangeForceAudioName/HitBreakAudioName属性

大爷 1 рік тому
батько
коміт
1d23ab275b

+ 15 - 21
Common/CommonAI/Zone/Data.cs

@@ -589,28 +589,23 @@ namespace CommonAI.Zone
         [ResourceIDAttribute]
         public string DeadAudioName;
 
-		[DescAttribute("切换阵营特效", "资源-切阵营")]
+		[DescAttribute("切换阵营特效", "资源")]
 		public LaunchEffect ChangeForceEffect;
 
-		[DescAttribute("切换阵营音效文件", "资源-切阵营")]
-		[ResourceIDAttribute]
-		public string ChangeForceAudioName;
-
-		[DescAttribute("破碎比例", "资源-破碎")]
+		[DescAttribute("破碎比例", "资源")]
 		public int HitBreakPrecent;
 
-		[DescAttribute("破碎特效", "资源-破碎")]
+		[DescAttribute("破碎特效", "资源")]
 		public LaunchEffect HitBreakEffect;
 
-		[DescAttribute("破碎音效文件", "资源-破碎")]
-		[ResourceIDAttribute]
-		public string HitBreakAudioName;
+        [DescAttribute("预加载资源列表", "资源")]
+        public string PreloadResources;
 
-		//------------------------------------
-		/// <summary>
-		/// 身体高度
-		/// </summary>
-		[DescAttribute("身体高度", "战斗")]
+        //------------------------------------
+        /// <summary>
+        /// 身体高度
+        /// </summary>
+        [DescAttribute("身体高度", "战斗")]
         public float BodyHeight;
         /// <summary>
         /// 身体尺寸(半径)
@@ -893,12 +888,11 @@ namespace CommonAI.Zone
 			ret.HitBreakPrecent = this.HitBreakPrecent;
 			ret.HitBreakEffect = CUtils.TryClone<LaunchEffect>(this.HitBreakEffect);
 			ret.ChangeForceEffect = CUtils.TryClone<LaunchEffect>(this.ChangeForceEffect);
-			ret.ChangeForceAudioName = this.ChangeForceAudioName;
 			ret.HitBreakPrecent = this.HitBreakPrecent;
 			ret.HitBreakEffect = this.HitBreakEffect;
-			ret.HitBreakAudioName = this.HitBreakAudioName;
 			ret.IsRandomName = this.IsRandomName;
 			ret.SumType = this.SumType;
+            ret.PreloadResources = this.PreloadResources;
 			return ret;
         }
 
@@ -976,14 +970,14 @@ namespace CommonAI.Zone
 
 			//破碎,切阵营
 			output.PutExt(this.ChangeForceEffect);
-			output.PutUTF(this.ChangeForceAudioName);
 			output.PutS32(this.HitBreakPrecent);
 			output.PutExt(this.HitBreakEffect);
-			output.PutUTF(this.HitBreakAudioName);
 
 			// 随机名字
 			output.PutBool(this.IsRandomName);
 			output.PutEnum8(this.SumType);
+
+            output.PutUTF(this.PreloadResources);
 		}
 
         public void ReadExternal(IInputStream input)
@@ -1060,14 +1054,14 @@ namespace CommonAI.Zone
             this.Properties = input.GetExt<IUnitProperties>(this.Properties);
 
 			this.ChangeForceEffect = input.GetExt<LaunchEffect>();
-			this.ChangeForceAudioName = input.GetUTF();
 			this.HitBreakPrecent = input.GetS32();
 			this.HitBreakEffect = input.GetExt<LaunchEffect>();
-			this.HitBreakAudioName = input.GetUTF();
 
 			this.IsRandomName = input.GetBool();
 			this.SumType = input.GetEnum8<SummonType>();
 
+            this.PreloadResources = input.GetUTF();
+
 			if (UType == UnitType.TYPE_NPC && this.RecoveryIntervalMS > 0)
 			{
 				log.Debug("NPC配置了恢复时间, 强行重置" + this.ID);

+ 2 - 2
Common/CommonLang/Properties/AssemblyInfo.cs

@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("CommonLang")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Morefuntek")]
+[assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("CommonLang")]
-[assembly: AssemblyCopyright("Copyright © Morefuntek 2013")]
+[assembly: AssemblyCopyright("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]