JieLing
							
						 | 
						
							
							
							
							
								
							
								32dfac2429
								
							
								
							
						 | 
						
							
							
								
								【资源名字冲突】
							
							
							
							
							
						 | 
						
							2021-01-18 18:02:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6ae1a0b75e
								
							
								
							
						 | 
						
							
							
								
								【ID1007696】
							
							
							
							
							
							
							
							【优化】逍遥游移动时头顶出现金币的奖励特效 
							
						 | 
						
							2021-01-07 17:45:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								44951a3766
								
							
								
							
						 | 
						
							
							
								
								[战斗] ====优化伤害,中毒燃烧数字显示速度
							
							
							
							
							
						 | 
						
							2020-12-31 14:14:56 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0054f5e646
								
							
								
							
						 | 
						
							
							
								
								【优化】十绝阵战斗结束后返回至挑战界面,而非编队界面(编队界面无法查看剩余挑战次数和当前绝阵排名)
							
							
							
							
							
						 | 
						
							2020-12-24 10:37:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a446b83908
								
							
								
							
						 | 
						
							
							
								
								冲突修改提交
							
							
							
							
							
						 | 
						
							2020-12-07 16:29:22 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f174c68db7
								
							
								
							
						 | 
						
							
							
								
								【资源】东华帝君普通攻击特效添加
							
							
							
							
							
						 | 
						
							2020-11-17 18:32:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f517b5e955
								
							
								
							
						 | 
						
							
							
								
								【资源】东华帝君技能特效资源显示错误修改
							
							
							
							
							
						 | 
						
							2020-11-16 16:45:37 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								04ba352791
								
							
								
							
						 | 
						
							
							
								
								【资源】 修改资源路径
							
							
							
							
							
						 | 
						
							2020-11-02 19:54:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3cdc100777
								
							
								
							
						 | 
						
							
							
								
								【社稷大典/灵兽】特效资源重新整理
							
							
							
							
							
						 | 
						
							2020-11-01 17:00:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								23253f96a2
								
							
								
							
						 | 
						
							
							
								
								【社稷大典】名字重复的资源处理
							
							
							
							
							
						 | 
						
							2020-11-01 16:23:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								21ec70a29e
								
							
								
							
						 | 
						
							
							
								
								【灵兽】抽卡特效位置移动
							
							
							
							
							
						 | 
						
							2020-11-01 16:20:04 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3479bd153c
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 合并 功能ok 但是战斗合完进不去
							
							
							
							
							
						 | 
						
							2020-10-31 17:01:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b3d15c1945
								
							
								
							
						 | 
						
							
							
								
								头像特效添加
							
							
							
							
							
						 | 
						
							2020-09-27 16:58:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								68c9726917
								
							
								
							
						 | 
						
							
							
								
								屏幕适配修改
							
							
							
							
							
						 | 
						
							2020-09-05 16:39:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								30697705be
								
							
								
							
						 | 
						
							
							
								
								每次销毁界面时清理一次不用的资源,界面打开音效配置添加
							
							
							
							
							
						 | 
						
							2020-09-04 10:03:35 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d1facab9de
								
							
								
							
						 | 
						
							
							
								
								重复引用的资源路径修改
							
							
							
							
							
						 | 
						
							2020-09-03 19:50:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d405d09c05
								
							
								
							
						 | 
						
							
							
								
								登录界面动画修改
							
							
							
							
							
						 | 
						
							2020-09-01 16:17:20 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								be1d62a888
								
							
								
							
						 | 
						
							
							
								
								修复登陆界面扫光显示错误的问题
							
							
							
							
							
						 | 
						
							2020-08-26 13:47:26 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								b28309e14e
								
							
								
							
						 | 
						
							
							
								
								资源位置移动
							
							
							
							
							
						 | 
						
							2020-08-25 19:26:51 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								2eeb381608
								
							
								
							
						 | 
						
							
							
								
								登陆界面资源替换
							
							
							
							
							
						 | 
						
							2020-08-25 17:56:55 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								f4292f1f08
								
							
								
							
						 | 
						
							
							
								
								无极青莲技能效果添加
							
							
							
							
							
						 | 
						
							2020-08-25 15:57:19 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								2ef85759a1
								
							
								
							
						 | 
						
							
							
								
								无敌盾,眩晕效果添加
							
							
							
							
							
						 | 
						
							2020-08-25 15:49:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6013365ad1
								
							
								
							
						 | 
						
							
							
								
								剑影仙踪特效更新
							
							
							
							
							
						 | 
						
							2020-08-24 16:07:08 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								ad3ee94a75
								
							
								
							
						 | 
						
							
							
								
								资源压缩方式修改,苹果资源压缩方式添加,
							
							
							
							
							
						 | 
						
							2020-08-14 17:29:06 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								acf9a73068
								
							
								
							
						 | 
						
							
							
								
								重复引用资源修改
							
							
							
							
							
						 | 
						
							2020-08-13 19:40:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jl_ios
							
						 | 
						
							
							
							
							
								
							
								02b7e07d20
								
							
								
							
						 | 
						
							
							
								
								删除无用的sdk资源,bugly添加缺少的文件
							
							
							
							
							
						 | 
						
							2020-08-11 14:04:05 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8be398717d
								
							
								
							
						 | 
						
							
							
								
								文件名重复修改
							
							
							
							
							
						 | 
						
							2020-07-31 15:09:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c328d4683c
								
							
								
							
						 | 
						
							
							
								
								特效添加提交
							
							
							
							
							
						 | 
						
							2020-07-30 10:08:58 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0c8a066142
								
							
								
							
						 | 
						
							
							
								
								普通攻击命中特效资源修改
							
							
							
							
							
						 | 
						
							2020-07-29 11:43:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2df9b068b9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-28 17:24:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								38a69a4017
								
							
								
							
						 | 
						
							
							
								
								编队添加特效
							
							
							
							
							
						 | 
						
							2020-07-28 16:54:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5f6783fc13
								
							
								
							
						 | 
						
							
							
								
								新通用被击特效提交
							
							
							
							
							
						 | 
						
							2020-07-28 16:30:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								99f9e7169e
								
							
								
							
						 | 
						
							
							
								
								添加特效
							
							
							
							
							
						 | 
						
							2020-07-28 15:06:47 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								87b221b621
								
							
								
							
						 | 
						
							
							
								
								新技能特效添加
							
							
							
							
							
						 | 
						
							2020-07-23 10:23:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f420ee3bd7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into 英雄技能特效添加
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ab_lzhl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_axl_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_bah_dww01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_bxxz_lhzf01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_chdr_qsqy01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_cy_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dhc_dhjf01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dj_hmhx01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dlsm_hskj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dm_lrzj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dst_zxtsl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dz_htjl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_eh_hslc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fhlh_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ft_csl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fx_lrzs01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_gg_alky01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ghn_ysyn01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hdxj_llhl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hhe_swzh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hsmw_swzh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hxps_xtcz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jcdp_dpzc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jgtn_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jhns_ylp01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jhxn_wxlz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jl_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jll_yjl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jls_jlsw01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jmm_myjm01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jw_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jy_jyh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jzy_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lc_ssym01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ldb_qzjfl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ljgz_hllw01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ls_lshd01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lsx_swz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lzz_fjlyl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mjn_lhj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mp_lqfc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mslz_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mw_mwz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mz_dzcx01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mz_pxz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_nxq_lyc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ny_qmsg01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_qxn_yyw01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_rd_gftm01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sdxj_sbj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sgb_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sjll_bgxp01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_tljz_zxxzl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ts_jzlcl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_tyxj_tyyq01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_wg_wgfg01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_xllh_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yc_ycmh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ygl_yll01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ygps_ysqr01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yj_fjcy01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ylw_pgdm01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_zbj_tpywl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_zz_zzm01.mp3.meta
#	data_execl/base_data/CombatControl.xlsx 
							
						 | 
						
							2020-07-21 14:48:51 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2d62a583c6
								
							
								
							
						 | 
						
							
							
								
								删除无用文件
							
							
							
							
							
						 | 
						
							2020-07-21 14:37:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bc43f00abc
								
							
								
							
						 | 
						
							
							
								
								资源名重复刷新
							
							
							
							
							
						 | 
						
							2020-07-16 20:14:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c5ae3c4c0b
								
							
								
							
						 | 
						
							
							
								
								新特效添加
							
							
							
							
							
						 | 
						
							2020-07-16 17:40:22 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								01f6157c3e
								
							
								
							
						 | 
						
							
							
								
								特效修改
							
							
							
							
							
						 | 
						
							2020-07-14 16:52:30 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bfd6a89b20
								
							
								
							
						 | 
						
							
							
								
								特效资源提交
							
							
							
							
							
						 | 
						
							2020-07-13 16:29:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								74a4d7e4dd
								
							
								
							
						 | 
						
							
							
								
								猪八戒特效资源提交
							
							
							
							
							
						 | 
						
							2020-07-13 15:38:20 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								9b97aef3d7
								
							
								
							
						 | 
						
							
							
								
								内网 0.15.15
							
							
							
							
							
						 | 
						
							2020-07-10 18:20:58 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ab724d407e
								
							
								
							
						 | 
						
							
							
								
								嫦娥,东华帝君,洛神特效添加
							
							
							
							
							
						 | 
						
							2020-07-10 16:22:40 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b999786cbb
								
							
								
							
						 | 
						
							
							
								
								部分技能配置
							
							
							
							
							
						 | 
						
							2020-07-08 10:34:41 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3b7e9e2cdd
								
							
								
							
						 | 
						
							
							
								
								特效文件新增
							
							
							
							
							
						 | 
						
							2020-07-07 14:33:48 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								cf93ea3910
								
							
								
							
						 | 
						
							
							
								
								新技能资源添加
							
							
							
							
							
						 | 
						
							2020-07-03 16:48:33 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d08552ca2f
								
							
								
							
						 | 
						
							
							
								
								外网0.16.13 内网0.15.24
							
							
							
							
							
						 | 
						
							2020-06-30 18:59:44 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								8c61581548
								
							
								
							
						 | 
						
							
							
								
								外网 0.16.10  内网 0.15.23
							
							
							
							
							
						 | 
						
							2020-06-28 17:48:49 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								e189462ac9
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.14
							
							
							
							
							
						 | 
						
							2020-06-18 20:39:29 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								cf5f3e9952
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.12
							
							
							
							
							
						 | 
						
							2020-06-13 11:47:13 +08:00 |