wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								87402befd4
								
							
								
							
						 | 
						
							
							
								
								删除无用特效
							
							
							
							
							
						 | 
						
							2024-01-29 11:46:38 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b394facc11
								
							
								
							
						 | 
						
							
							
								
								删除无用特效
							
							
							
							
							
						 | 
						
							2024-01-26 14:41:47 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								199654f33a
								
							
								
							
						 | 
						
							
							
								
								删除0075技能特效
							
							
							
							
							
						 | 
						
							2024-01-26 11:30:08 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								0708630890
								
							
								
							
						 | 
						
							
							
								
								新英雄  ===================雨女资源提交
							
							
							
							
							
						 | 
						
							2023-02-28 10:59:28 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9291351094
								
							
								
							
						 | 
						
							
							
								
								【资源】名称变化
							
							
							
							
							
						 | 
						
							2022-02-10 17:56:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1548abda69
								
							
								
							
						 | 
						
							
							
								
								【资源】资源名重复修正
							
							
							
							
							
						 | 
						
							2022-01-24 11:16:52 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4034a90a33
								
							
								
							
						 | 
						
							
							
								
								[飞升]======优化修改提交
							
							
							
							
							
						 | 
						
							2022-01-19 15:29:47 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								581bfa2615
								
							
								
							
						 | 
						
							
							
								
								【飞升】=============飞升特效修改提交
							
							
							
							
							
						 | 
						
							2022-01-10 13:59:07 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5b670023ed
								
							
								
							
						 | 
						
							
							
								
								[飞升]=======飞升代码逻辑提交
							
							
							
							
							
						 | 
						
							2022-01-05 18:17:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ba182c0671
								
							
								
							
						 | 
						
							
							
								
								【特效】女儿国王特效白片修复
							
							
							
							
							
						 | 
						
							2021-12-13 17:29:44 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								06948fe7fd
								
							
								
							
						 | 
						
							
							
								
								[战斗]======人系普攻特效修改
							
							
							
							
							
						 | 
						
							2021-12-06 16:18:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0d11371d87
								
							
								
							
						 | 
						
							
							
								
								【资源冲突】资源名修改提交
							
							
							
							
							
						 | 
						
							2021-12-06 16:15:24 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								35784b8228
								
							
								
							
						 | 
						
							
							
								
								【特效】======牛魔王皮肤特效修改
							
							
							
							
							
						 | 
						
							2021-12-06 10:22:34 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								db8beee485
								
							
								
							
						 | 
						
							
							
								
								[特效]=======人系施法过程特效修改
							
							
							
							
							
						 | 
						
							2021-12-02 14:48:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0b5575c6f2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/dev_res
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_lingshou_fanzhuan/Materials/fx_kapianfanmian_daoguangppp.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Materials/blz_400_dagger_end 2.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Model/fuwenlujing_ctrl.controller.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_dao_guocheng.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_ren_guocheng.prefab
#	Assets/ManagedResources/Spine/c_0054/c_0054_Atlas.asset.meta
#	Assets/ManagedResources/Spine/c_0054/c_0054_Material.mat.meta
#	Assets/ManagedResources/Spine/c_0054/c_0054_SkeletonData.asset.meta
#	Assets/ManagedResources/Spine/s_fuxi/s_fuxi_Atlas.asset.meta
#	Assets/ManagedResources/Spine/s_fuxi/s_fuxi_SkeletonData.asset.meta 
							
						 | 
						
							2021-12-02 14:39:03 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								bca44801ef
								
							
								
							
						 | 
						
							
							
								
								【特效】=====牛魔王皮肤特效 人系特效弹道修改
							
							
							
							
							
						 | 
						
							2021-12-02 13:10:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								40a2898ab0
								
							
								
							
						 | 
						
							
							
								
								【资源】普通特效优化 道
							
							
							
							
							
						 | 
						
							2021-12-02 01:56:37 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7c9741c522
								
							
								
							
						 | 
						
							
							
								
								【资源】普通特效优化 道
							
							
							
							
							
						 | 
						
							2021-12-02 01:56:56 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f86bb0d997
								
							
								
							
						 | 
						
							
							
								
								【特效】人道 transform -> rectTransform
							
							
							
							
							
						 | 
						
							2021-11-27 14:57:31 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a5fb77cf9d
								
							
								
							
						 | 
						
							
							
								
								【特效】人道 transform -> rectTransform
							
							
							
							
							
						 | 
						
							2021-11-27 14:57:15 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								72cd7fde38
								
							
								
							
						 | 
						
							
							
								
								【特效】四阵营普攻特效优化 人 道
							
							
							
							
							
						 | 
						
							2021-11-27 14:41:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bf3e7d0d14
								
							
								
							
						 | 
						
							
							
								
								【特效】四阵营普攻特效优化 人 道
							
							
							
							
							
						 | 
						
							2021-11-27 14:39:28 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								41d60d9f5e
								
							
								
							
						 | 
						
							
							
								
								【特效】修复道特效显示错误
							
							
							
							
							
						 | 
						
							2021-11-26 18:26:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7988001d99
								
							
								
							
						 | 
						
							
							
								
								【特效】资源名变化
							
							
							
							
							
						 | 
						
							2021-11-26 14:29:30 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bd423ffbd6
								
							
								
							
						 | 
						
							
							
								
								【资源】资源名称重复
							
							
							
							
							
						 | 
						
							2021-11-26 11:35:48 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ae03cddcc9
								
							
								
							
						 | 
						
							
							
								
								【特效】四阵营普攻优化
							
							
							
							
							
						 | 
						
							2021-11-26 11:28:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								70d9b2e120
								
							
								
							
						 | 
						
							
							
								
								【资源】资源名重复修改
							
							
							
							
							
						 | 
						
							2021-11-26 11:27:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								28c9748716
								
							
								
							
						 | 
						
							
							
								
								【特效】四阵营普攻优化
							
							
							
							
							
						 | 
						
							2021-11-26 11:17:45 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								7949e8c21c
								
							
								
							
						 | 
						
							
							
								
								【战斗】========灵兽卡面翻转提交
							
							
							
							
							
						 | 
						
							2021-11-25 18:47:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c5e80eb141
								
							
								
							
						 | 
						
							
							
								
								资源重复提交
							
							
							
							
							
						 | 
						
							2021-11-25 13:16:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1a2a5e0c71
								
							
								
							
						 | 
						
							
							
								
								【普攻特效】人佛技能优化
							
							
							
							
							
						 | 
						
							2021-11-25 11:44:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								25e77c3ce4
								
							
								
							
						 | 
						
							
							
								
								【普攻特效】人佛技能优化
							
							
							
							
							
						 | 
						
							2021-11-25 11:44:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0ea258d1e8
								
							
								
							
						 | 
						
							
							
								
								【资源】各阵营普攻特效优化
							
							
							
							
							
						 | 
						
							2021-11-24 14:42:05 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								36f017fbaa
								
							
								
							
						 | 
						
							
							
								
								【新普攻特效】显示优化
							
							
							
							
							
						 | 
						
							2021-11-24 14:41:59 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								338312dbd7
								
							
								
							
						 | 
						
							
							
								
								【战斗】=======4阵营普通攻击新特效上传
							
							
							
							
							
						 | 
						
							2021-11-24 14:41:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								fd29507df3
								
							
								
							
						 | 
						
							
							
								
								【资源】各阵营普攻特效优化
							
							
							
							
							
						 | 
						
							2021-11-24 14:28:30 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								6c3c4a0a70
								
							
								
							
						 | 
						
							
							
								
								【新普攻特效】显示优化
							
							
							
							
							
						 | 
						
							2021-11-23 15:28:49 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								da359914dc
								
							
								
							
						 | 
						
							
							
								
								【战斗】=======4阵营普通攻击新特效上传
							
							
							
							
							
						 | 
						
							2021-11-22 11:06:35 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5eef9ba873
								
							
								
							
						 | 
						
							
							
								
								[特效]=========主角一技能特效
							
							
							
							
							
						 | 
						
							2021-11-15 14:39:36 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								14f1d213e3
								
							
								
							
						 | 
						
							
							
								
								【神魂特效】资源名重复修改
							
							
							
							
							
						 | 
						
							2021-11-05 17:47:43 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ef8ed01cd2
								
							
								
							
						 | 
						
							
							
								
								【资源】重复资源名修改
							
							
							
							
							
						 | 
						
							2021-10-29 17:51:23 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								c33a6794a8
								
							
								
							
						 | 
						
							
							
								
								【特效】=========敖丙网球王子技能动画名称修改
							
							
							
							
							
						 | 
						
							2021-10-29 17:48:14 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								47b1b26a75
								
							
								
							
						 | 
						
							
							
								
								【战斗】=====敖丙皮肤特效提交
							
							
							
							
							
						 | 
						
							2021-10-29 17:48:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ce39857111
								
							
								
							
						 | 
						
							
							
								
								杨戬新资源修改提交
							
							
							
							
							
						 | 
						
							2021-10-08 14:18:31 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f16fb2680b
								
							
								
							
						 | 
						
							
							
								
								【织女特效】资源名重复优化
							
							
							
							
							
						 | 
						
							2021-09-27 13:47:23 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5c5e0e26a3
								
							
								
							
						 | 
						
							
							
								
								【资源】=========织女 特效资源提交
							
							
							
							
							
						 | 
						
							2021-09-27 13:46:53 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								c573d83eeb
								
							
								
							
						 | 
						
							
							
								
								女儿国王特效资源提交
							
							
							
							
							
						 | 
						
							2021-09-24 14:53:47 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								36dff25c3e
								
							
								
							
						 | 
						
							
							
								
								【资源名重复修改】
							
							
							
							
							
						 | 
						
							2021-09-22 15:55:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b74d5ebf38
								
							
								
							
						 | 
						
							
							
								
								【资源】资源名重复
							
							
							
							
							
						 | 
						
							2021-09-07 10:27:09 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								e9bb0163de
								
							
								
							
						 | 
						
							
							
								
								【资源】杨戬施法特效
							
							
							
							
							
						 | 
						
							2021-09-02 10:42:28 +08:00 |