JieLing
							
						 | 
						
							
							
							
							
								
							
								4c9db13851
								
							
								
							
						 | 
						
							
							
								
								修复青龙秘宝不关闭bug
							
							
							
							
							
						 | 
						
							2020-09-23 17:41:48 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								443a157006
								
							
								
							
						 | 
						
							
							
								
								【破阵诛仙】点金达人任务,跳转点金,不计数,修复乾坤宝盒快速切换报错的问题
							
							
							
							
							
						 | 
						
							2020-09-22 18:13:49 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								f58f067fe5
								
							
								
							
						 | 
						
							
							
								
								Revert "【破阵诛仙】点金达人任务,跳转点金,不计数"
							
							
							
							
							
							
							
							This reverts commit c5ffb7cb23. 
							
						 | 
						
							2020-09-22 18:01:41 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								17675838d7
								
							
								
							
						 | 
						
							
							
								
								漏提
							
							
							
							
							
						 | 
						
							2020-09-22 17:46:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								dd8e9ab701
								
							
								
							
						 | 
						
							
							
								
								青龙秘宝入口修改
							
							
							
							
							
						 | 
						
							2020-09-22 17:46:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e3b387b8af
								
							
								
							
						 | 
						
							
							
								
								十绝阵奖励偏移修改
							
							
							
							
							
						 | 
						
							2020-09-22 17:39:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7a6ae258fb
								
							
								
							
						 | 
						
							
							
								
								修复魂印图鉴界面销毁后再次打开报错的问题
							
							
							
							
							
						 | 
						
							2020-09-22 17:38:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9540d87893
								
							
								
							
						 | 
						
							
							
								
								【青龙秘宝】达到最大等级还可以购买等级【青龙秘宝】周任务刷新后倒计时负数【青龙秘宝】活动结束入口不消失
							
							
							
							
							
						 | 
						
							2020-09-22 17:38:09 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								51adf32101
								
							
								
							
						 | 
						
							
							
								
								漏提
							
							
							
							
							
						 | 
						
							2020-09-22 17:37:28 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								00287b66a6
								
							
								
							
						 | 
						
							
							
								
								线上问题:    大闹天宫节点例会重叠
							
							
							
							
							
						 | 
						
							2020-09-22 17:37:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c5ffb7cb23
								
							
								
							
						 | 
						
							
							
								
								【破阵诛仙】点金达人任务,跳转点金,不计数
							
							
							
							
							
						 | 
						
							2020-09-22 17:36:43 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								24f6333726
								
							
								
							
						 | 
						
							
							
								
								线上问题:    试炼节点显示立绘与招募得到的不一致  前端修改
							
							
							
							
							
						 | 
						
							2020-09-22 17:33:57 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								fc97424538
								
							
								
							
						 | 
						
							
							
								
								线上问题 :  一键编队上阵了归元后战力低的英雄
							
							
							
							
							
						 | 
						
							2020-09-22 17:33:37 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								5985c0304f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_tishen_hw' of http://60.1.1.230/gaoxin/JL_Client into master_tishen_hw
							
							
							
							
							
						 | 
						
							2020-09-22 10:36:10 +08:00 | 
						
					
				
					
						
							
							
								 
								wangxiaolong
							
						 | 
						
							
							
							
							
								
							
								12f296aa6d
								
							
								
							
						 | 
						
							
							
								
								添加日志输出
							
							
							
							
							
						 | 
						
							2020-09-22 10:34:22 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								02b58da225
								
							
								
							
						 | 
						
							
							
								
								修复进入游戏报错
							
							
							
							
							
						 | 
						
							2020-09-21 18:26:54 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								c7becc2fc6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_tishen_hw' of http://60.1.1.230/gaoxin/JL_Client into master_tishen_hw
							
							
							
							
							
						 | 
						
							2020-09-21 17:00:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8ee791ab0e
								
							
								
							
						 | 
						
							
							
								
								修复十绝阵卡死的问题
							
							
							
							
							
						 | 
						
							2020-09-21 16:57:30 +08:00 | 
						
					
				
					
						
							
							
								 
								wangxiaolong
							
						 | 
						
							
							
							
							
								
							
								68e2fda511
								
							
								
							
						 | 
						
							
							
								
								添加日志输出
							
							
							
							
							
						 | 
						
							2020-09-21 16:55:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9f75396c03
								
							
								
							
						 | 
						
							
							
								
								修改tapdb设置服务器数据的调用位置
							
							
							
							
							
						 | 
						
							2020-09-21 16:48:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b77d0c9725
								
							
								
							
						 | 
						
							
							
								
								删除战斗资源预加载的操作,预加载的资源会导致内存泄漏。
							
							
							
							
							
						 | 
						
							2020-09-21 16:47:49 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								1f203f6874
								
							
								
							
						 | 
						
							
							
								
								修复加载到登陆加载100%卡死的问题
							
							
							
							
							
						 | 
						
							2020-09-21 16:47:04 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								d8013ccd8c
								
							
								
							
						 | 
						
							
							
								
								打开充值每日礼包 和 成长礼包 红点检测
							
							
							
							
							
						 | 
						
							2020-09-21 16:40:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b3067cca48
								
							
								
							
						 | 
						
							
							
								
								修复切磋战斗结果只会显示失败的问题
							
							
							
							
							
						 | 
						
							2020-09-21 16:39:59 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								6034586a26
								
							
								
							
						 | 
						
							
							
								
								修复切换账号进入不同区服,会导致老账号默认区服错误的问题。
							
							
							
							
							
						 | 
						
							2020-09-19 16:59:56 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								600044eab5
								
							
								
							
						 | 
						
							
							
								
								修复跳转天宫商店会显示其他商店商品的问题
							
							
							
							
							
						 | 
						
							2020-09-18 13:56:36 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								aca5c4683c
								
							
								
							
						 | 
						
							
							
								
								添加界面加载过程的日志
							
							
							
							
							
						 | 
						
							2020-09-18 11:29:34 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								4f4efeeea4
								
							
								
							
						 | 
						
							
							
								
								修复取消支付后无法再次发起支付的问题,同时取消了对网络延迟的处理
							
							
							
							
							
						 | 
						
							2020-09-15 18:55:33 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								943c04917e
								
							
								
							
						 | 
						
							
							
								
								将分割符换为  下划线
							
							
							
							
							
						 | 
						
							2020-09-14 12:59:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								dbb57924a6
								
							
								
							
						 | 
						
							
							
								
								修改透传参数consumerId 为 角色id#商品id    修复sdk支付基金不刷新的问题,
							
							
							
							
							
						 | 
						
							2020-09-14 11:29:58 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3fabc33ab6
								
							
								
							
						 | 
						
							
							
								
								添加用于定位商品充值成功后无法刷新界面问题的log
							
							
							
							
							
						 | 
						
							2020-09-12 19:32:03 +08:00 | 
						
					
				
					
						
							
							
								 
								wangxiaolong
							
						 | 
						
							
							
							
							
								
							
								210668d51d
								
							
								
							
						 | 
						
							
							
								
								添加网络层log输出
							
							
							
							
							
						 | 
						
							2020-09-12 19:31:51 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								807a730802
								
							
								
							
						 | 
						
							
							
								
								尝试修复战斗中重连偶现关卡数据丢失的问题
							
							
							
							
							
						 | 
						
							2020-09-12 19:31:45 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								64fdc8784a
								
							
								
							
						 | 
						
							
							
								
								添加一些报错打印
							
							
							
							
							
						 | 
						
							2020-09-12 19:31:40 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								3d594a7d8e
								
							
								
							
						 | 
						
							
							
								
								文字表修改
							
							
							
							
							
						 | 
						
							2020-09-10 14:51:20 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								e18ac274db
								
							
								
							
						 | 
						
							
							
								
								修复sdk无法登陆的问题
							
							
							
							
							
						 | 
						
							2020-09-10 14:50:25 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								efc9ff9daf
								
							
								
							
						 | 
						
							
							
								
								修改注册打点事件,将部分静态数据放在注册之前
							
							
							
							
							
						 | 
						
							2020-09-09 20:40:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								701db5bb17
								
							
								
							
						 | 
						
							
							
								
								充值接口修改,sdk和本地走同一套接口
							
							
							
							
							
						 | 
						
							2020-09-09 20:13:23 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d440edea11
								
							
								
							
						 | 
						
							
							
								
								打开兑换码功能
							
							
							
							
							
						 | 
						
							2020-09-09 20:12:11 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								604de656df
								
							
								
							
						 | 
						
							
							
								
								巅峰赛战斗结束界面适配
							
							
							
							
							
						 | 
						
							2020-09-07 15:39:57 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4edb1c7925
								
							
								
							
						 | 
						
							
							
								
								修复可能在引导日常之前就可以领取日常奖励的问题
							
							
							
							
							
						 | 
						
							2020-09-07 15:38:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a46ee1c52c
								
							
								
							
						 | 
						
							
							
								
								修复引导急速探索报错的问题
							
							
							
							
							
						 | 
						
							2020-09-07 15:26:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								5a917b1374
								
							
								
							
						 | 
						
							
							
								
								巅峰赛详情适配
							
							
							
							
							
						 | 
						
							2020-09-07 15:02:16 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								dc0c6320f1
								
							
								
							
						 | 
						
							
							
								
								代码漏提
							
							
							
							
							
						 | 
						
							2020-09-07 13:53:22 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								bf38fd1ab6
								
							
								
							
						 | 
						
							
							
								
								修改技能图片
							
							
							
							
							
						 | 
						
							2020-09-07 11:54:03 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b62fe63c84
								
							
								
							
						 | 
						
							
							
								
								关闭战斗log
							
							
							
							
							
						 | 
						
							2020-09-05 20:40:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								06afe99236
								
							
								
							
						 | 
						
							
							
								
								宽屏边缘用图片代替黑边
							
							
							
							
							
						 | 
						
							2020-09-05 19:02:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4ca09780a0
								
							
								
							
						 | 
						
							
							
								
								引导添加检测类型
							
							
							
							
							
						 | 
						
							2020-09-05 17:24:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7afe25a5d2
								
							
								
							
						 | 
						
							
							
								
								界面适配修改,引导添加网络延时检测
							
							
							
							
							
						 | 
						
							2020-09-05 17:21:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								338b7b4375
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-05 16:44:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3103a4122b
								
							
								
							
						 | 
						
							
							
								
								设置,几天好礼界面内容修改
							
							
							
							
							
						 | 
						
							2020-09-05 16:43:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f8508a8663
								
							
								
							
						 | 
						
							
							
								
								shipei
							
							
							
							
							
						 | 
						
							2020-09-05 16:43:25 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								68c9726917
								
							
								
							
						 | 
						
							
							
								
								屏幕适配修改
							
							
							
							
							
						 | 
						
							2020-09-05 16:39:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								21e7bf2e80
								
							
								
							
						 | 
						
							
							
								
								shi pei
							
							
							
							
							
						 | 
						
							2020-09-05 16:28:52 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f36b3c7879
								
							
								
							
						 | 
						
							
							
								
								shi pei
							
							
							
							
							
						 | 
						
							2020-09-05 16:16:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0d82f376b0
								
							
								
							
						 | 
						
							
							
								
								shi pei
							
							
							
							
							
						 | 
						
							2020-09-05 15:28:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								37f2fd9bdf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-05 15:21:55 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d05b5d43f1
								
							
								
							
						 | 
						
							
							
								
								android p 以上机型屏幕适配添加
							
							
							
							
							
						 | 
						
							2020-09-05 15:21:41 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								c35058767b
								
							
								
							
						 | 
						
							
							
								
								shi pei
							
							
							
							
							
						 | 
						
							2020-09-05 15:20:30 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								96e795c7c5
								
							
								
							
						 | 
						
							
							
								
								全屏界面  背景图片适配脚本  自行挂载
							
							
							
							
							
						 | 
						
							2020-09-05 14:22:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								fb6a6c9da5
								
							
								
							
						 | 
						
							
							
								
								添加cmdbuffer的使用,优化RenderTexture渲染消耗,未开启使用,为以后优化做准备
							
							
							
							
							
						 | 
						
							2020-09-05 12:30:00 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								92a8b93b50
								
							
								
							
						 | 
						
							
							
								
								修改屏幕的适配方式,修改计算屏幕位置的方法
							
							
							
							
							
						 | 
						
							2020-09-05 12:15:58 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9937727ede
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 18:35:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6b55198f12
								
							
								
							
						 | 
						
							
							
								
								周月礼包替图
							
							
							
							
							
						 | 
						
							2020-09-04 18:35:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								aec554c002
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 18:06:49 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f6fde7a2c8
								
							
								
							
						 | 
						
							
							
								
								试炼副本增加动效
							
							
							
							
							
						 | 
						
							2020-09-04 18:04:54 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cbad6e10cd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 17:51:05 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bbd5d3bda2
								
							
								
							
						 | 
						
							
							
								
								成长基金
							
							
							
							
							
						 | 
						
							2020-09-04 17:50:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4b50f8408b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 17:46:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								63cde2092d
								
							
								
							
						 | 
						
							
							
								
								无尽副本界面动效增加
							
							
							
							
							
						 | 
						
							2020-09-04 17:46:27 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								69a4bc320d
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-09-04 17:44:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f6a3178926
								
							
								
							
						 | 
						
							
							
								
								xiugai
							
							
							
							
							
						 | 
						
							2020-09-04 17:34:59 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								606ecfe6b2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 17:33:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5330808e19
								
							
								
							
						 | 
						
							
							
								
								送神祠动效增加
							
							
							
							
							
						 | 
						
							2020-09-04 17:33:42 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								56092d5572
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 17:21:51 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								14206a0cba
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 17:21:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f9ed1f14be
								
							
								
							
						 | 
						
							
							
								
								化虚境动效添加
							
							
							
							
							
						 | 
						
							2020-09-04 17:21:21 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								d1e44c360d
								
							
								
							
						 | 
						
							
							
								
								xiugai
							
							
							
							
							
						 | 
						
							2020-09-04 17:21:16 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								2c872553ba
								
							
								
							
						 | 
						
							
							
								
								音頻跟新
							
							
							
							
							
						 | 
						
							2020-09-04 17:18:05 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7da522065d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 17:03:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								70d3fcfe9f
								
							
								
							
						 | 
						
							
							
								
								断器阁动效增加
							
							
							
							
							
						 | 
						
							2020-09-04 17:03:37 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7dbf679a40
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 16:55:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5a861862d5
								
							
								
							
						 | 
						
							
							
								
								商店添加动画
							
							
							
							
							
						 | 
						
							2020-09-04 16:54:58 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								332e32bb22
								
							
								
							
						 | 
						
							
							
								
								宝物资源
							
							
							
							
							
						 | 
						
							2020-09-04 16:50:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								59481b302a
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-09-04 15:28:27 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								86feac0023
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into master_tishen_hw
							
							
							
							
							
							
							
							# Conflicts:
#	ProjectSettings/ProjectSettings.asset 
							
						 | 
						
							2020-09-04 15:08:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f6686cb1ae
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 15:06:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b3b001c0df
								
							
								
							
						 | 
						
							
							
								
								装备魂印黑边
							
							
							
							
							
						 | 
						
							2020-09-04 15:05:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								70f553b732
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 14:35:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								502fa23bd1
								
							
								
							
						 | 
						
							
							
								
								关两个垃圾log
							
							
							
							
							
						 | 
						
							2020-09-04 14:35:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8232879006
								
							
								
							
						 | 
						
							
							
								
								车迟排名界面调整、日常本底部适配、万象境“新”字bug修复
							
							
							
							
							
						 | 
						
							2020-09-04 14:30:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								82b1d2595a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into master_tishen_hw
							
							
							
							
							
						 | 
						
							2020-09-04 13:47:12 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1c59eb5ff4
								
							
								
							
						 | 
						
							
							
								
								编队提示文字适配
							
							
							
							
							
						 | 
						
							2020-09-04 11:33:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								18f5055d20
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-04 10:26:03 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f7d939b016
								
							
								
							
						 | 
						
							
							
								
								关闭登录流程
							
							
							
							
							
						 | 
						
							2020-09-04 10:25:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6d15b0171e
								
							
								
							
						 | 
						
							
							
								
								工会副本
							
							
							
							
							
						 | 
						
							2020-09-04 10:23:57 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								30697705be
								
							
								
							
						 | 
						
							
							
								
								每次销毁界面时清理一次不用的资源,界面打开音效配置添加
							
							
							
							
							
						 | 
						
							2020-09-04 10:03:35 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e6e5c39cdd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 19:50:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d1facab9de
								
							
								
							
						 | 
						
							
							
								
								重复引用的资源路径修改
							
							
							
							
							
						 | 
						
							2020-09-03 19:50:26 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ca036d6d0a
								
							
								
							
						 | 
						
							
							
								
								天宫商店、无尽商店货币加号增加、无尽副本战斗胜利不显示经验
							
							
							
							
							
						 | 
						
							2020-09-03 18:16:20 +08:00 |