gaoxin
							
						 | 
						
							
							
							
							
								
							
								19a2229fb8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-30 11:01:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								88fff64e80
								
							
								
							
						 | 
						
							
							
								
								修改短音效的播放方式
							
							
							
							
							
						 | 
						
							2020-07-30 10:57:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								83999b75d5
								
							
								
							
						 | 
						
							
							
								
								战斗内添加日志上报功能
							
							
							
							
							
						 | 
						
							2020-07-30 10:57:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c328d4683c
								
							
								
							
						 | 
						
							
							
								
								特效添加提交
							
							
							
							
							
						 | 
						
							2020-07-30 10:08:58 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3f414f3d83
								
							
								
							
						 | 
						
							
							
								
								森罗编队提交
							
							
							
							
							
						 | 
						
							2020-07-29 21:08:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ee4ecf49c2
								
							
								
							
						 | 
						
							
							
								
								森罗环境 炸弹 终于完了
							
							
							
							
							
						 | 
						
							2020-07-29 20:18:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f806272897
								
							
								
							
						 | 
						
							
							
								
								GM
							
							
							
							
							
						 | 
						
							2020-07-29 19:35:29 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e852022166
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-29 18:36:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								971622a4c5
								
							
								
							
						 | 
						
							
							
								
								限时兑换 文字修改
							
							
							
							
							
						 | 
						
							2020-07-29 18:36:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b54534db2f
								
							
								
							
						 | 
						
							
							
								
								chechihongdian update
							
							
							
							
							
						 | 
						
							2020-07-29 18:27:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								47b7beaa08
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-29 18:16:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c78cebde62
								
							
								
							
						 | 
						
							
							
								
								hongdianjiance tijao
							
							
							
							
							
						 | 
						
							2020-07-29 18:16:11 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								dadf5e2fe9
								
							
								
							
						 | 
						
							
							
								
								音效播放时机放在特效之前
							
							
							
							
							
						 | 
						
							2020-07-29 18:11:25 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2e5b87250b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-29 18:05:45 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d9a26568e4
								
							
								
							
						 | 
						
							
							
								
								添加战斗日志上报功能
							
							
							
							
							
						 | 
						
							2020-07-29 18:05:40 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								66bfd4f4c9
								
							
								
							
						 | 
						
							
							
								
								车迟提交
							
							
							
							
							
						 | 
						
							2020-07-29 17:53:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b9084626eb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-29 17:51:40 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b2af34a2b3
								
							
								
							
						 | 
						
							
							
								
								副本红点提交
							
							
							
							
							
						 | 
						
							2020-07-29 17:50:15 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								5af034b02d
								
							
								
							
						 | 
						
							
							
								
								修改技能特效
							
							
							
							
							
						 | 
						
							2020-07-29 17:43:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								73301996e7
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-29 16:55:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e334375798
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-29 16:28:06 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								72fef2124a
								
							
								
							
						 | 
						
							
							
								
								
							
							
							
							
							
						 | 
						
							2020-07-29 16:27:56 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b2a54634d2
								
							
								
							
						 | 
						
							
							
								
								适配调整   巅峰赛入口
							
							
							
							
							
						 | 
						
							2020-08-15 00:08:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								59d03efa95
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-29 16:14:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4ab1e8c02d
								
							
								
							
						 | 
						
							
							
								
								点将台 汇聚箱 充值提示 关闭
							
							
							
							
							
						 | 
						
							2020-07-29 16:12:17 +08:00 | 
						
					
				
					
						
							
							
								 
								szxhzz
							
						 | 
						
							
							
							
							
								
							
								200d2ca70c
								
							
								
							
						 | 
						
							
							
								
								删除多余音频
							
							
							
							
							
						 | 
						
							2020-07-29 15:56:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								6c13631569
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-29 15:49:01 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								e34274546f
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-29 15:48:28 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ce6c8c7871
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-29 15:44:47 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								47beef7399
								
							
								
							
						 | 
						
							
							
								
								尝试修改抽卡报错
							
							
							
							
							
						 | 
						
							2020-07-29 15:43:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d593bab16b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-29 14:37:22 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								74b9cc5c55
								
							
								
							
						 | 
						
							
							
								
								成员红点检测  巅峰战编队入口显示修复
							
							
							
							
							
						 | 
						
							2020-08-11 00:08:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c03e9336bc
								
							
								
							
						 | 
						
							
							
								
								"info" exception 修复
							
							
							
							
							
						 | 
						
							2020-07-29 14:37:12 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a2635081af
								
							
								
							
						 | 
						
							
							
								
								规避不灭效果修改
							
							
							
							
							
						 | 
						
							2020-07-29 13:41:15 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0c8a066142
								
							
								
							
						 | 
						
							
							
								
								普通攻击命中特效资源修改
							
							
							
							
							
						 | 
						
							2020-07-29 11:43:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b8f7c9789d
								
							
								
							
						 | 
						
							
							
								
								删除无用rendertexture资源
							
							
							
							
							
						 | 
						
							2020-07-29 11:42:21 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8261fe72a4
								
							
								
							
						 | 
						
							
							
								
								尝试修改第一次引导战斗会进入解锁章节界面的问题
							
							
							
							
							
						 | 
						
							2020-07-29 11:40:15 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f058668af6
								
							
								
							
						 | 
						
							
							
								
								修复红点id重复,导致聊天红点显示错误的问题
							
							
							
							
							
						 | 
						
							2020-07-29 11:39:52 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								a0957c03ad
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-29 10:50:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								80d9c0b3a7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-29 02:32:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2731d973fb
								
							
								
							
						 | 
						
							
							
								
								删除跳过按钮的首充提示
							
							
							
							
							
						 | 
						
							2020-07-29 02:32:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								829a102c73
								
							
								
							
						 | 
						
							
							
								
								关闭音频
							
							
							
							
							
						 | 
						
							2020-07-29 00:32:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								650f872a0c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-29 00:04:56 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2980205399
								
							
								
							
						 | 
						
							
							
								
								修复假战斗报错的问题
							
							
							
							
							
						 | 
						
							2020-07-29 00:02:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7e917243e8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-28 23:25:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4f14ee8599
								
							
								
							
						 | 
						
							
							
								
								商店金币位数调整
							
							
							
							
							
						 | 
						
							2020-07-28 23:25:43 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								28ad4fb613
								
							
								
							
						 | 
						
							
							
								
								update kuang
							
							
							
							
							
						 | 
						
							2020-07-28 23:14:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								48f57d05f1
								
							
								
							
						 | 
						
							
							
								
								headframe update
							
							
							
							
							
						 | 
						
							2020-07-28 23:07:26 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d2bacc77ca
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2020-07-28 22:41:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a37402d40f
								
							
								
							
						 | 
						
							
							
								
								cardelay update
							
							
							
							
							
						 | 
						
							2020-07-28 22:33:38 +08:00 |