gaoxin
							
						 | 
						
							
							
							
							
								
							
								dfb04baf75
								
							
								
							
						 | 
						
							
							
								
								【限时升星】添加可选择的升星有礼活动
							
							
							
							
							
						 | 
						
							2022-01-08 18:40:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bb343cdcc5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-08 17:49:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								244c8050e0
								
							
								
							
						 | 
						
							
							
								
								【装备】装备界面套装属性显示不正确修改
							
							
							
							
							
						 | 
						
							2022-01-08 17:49:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0281564bb3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-08 17:47:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ecaa9f1dbc
								
							
								
							
						 | 
						
							
							
								
								【英雄选择】英雄选择界面通用化
							
							
							
							
							
						 | 
						
							2022-01-08 17:47:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a0baa2e1c0
								
							
								
							
						 | 
						
							
							
								
								法宝聚灵增加星级加成
							
							
							
							
							
						 | 
						
							2022-01-08 17:47:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0a4c24520c
								
							
								
							
						 | 
						
							
							
								
								【编队筛选】红叉资源替换
							
							
							
							
							
						 | 
						
							2022-01-08 15:03:06 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e12ddf56c6
								
							
								
							
						 | 
						
							
							
								
								【编队筛选】修复呼吸闪烁
							
							
							
							
							
						 | 
						
							2022-01-08 14:50:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2a630a8c25
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-08 14:23:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a4bd6fb441
								
							
								
							
						 | 
						
							
							
								
								【日常】修复动画导致成就显示异常
							
							
							
							
							
						 | 
						
							2022-01-08 14:23:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								129250110f
								
							
								
							
						 | 
						
							
							
								
								【建木神树】满级取消箭头
							
							
							
							
							
						 | 
						
							2022-01-08 14:22:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9098900dc7
								
							
								
							
						 | 
						
							
							
								
								【建木神树】提交
							
							
							
							
							
						 | 
						
							2022-01-08 11:54:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c157985e24
								
							
								
							
						 | 
						
							
							
								
								【建木神树】调整
							
							
							
							
							
						 | 
						
							2022-01-08 11:36:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e4a5f213e8
								
							
								
							
						 | 
						
							
							
								
								【建木神树】显示调整
							
							
							
							
							
						 | 
						
							2022-01-08 11:17:26 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								94cf5e4aec
								
							
								
							
						 | 
						
							
							
								
								【建木神树】提交
							
							
							
							
							
						 | 
						
							2022-01-08 10:33:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								314cc59bbc
								
							
								
							
						 | 
						
							
							
								
								【建木神树】提交
							
							
							
							
							
						 | 
						
							2022-01-07 19:39:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3d7b866229
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-07 19:34:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								334ba9bd19
								
							
								
							
						 | 
						
							
							
								
								【建木神树优化】界面中可预览当前神应属性和下级增加属性
							
							
							
							
							
						 | 
						
							2022-01-07 19:34:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								720d42f129
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-07 18:28:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2ad247d4f9
								
							
								
							
						 | 
						
							
							
								
								【神将筛选】职业图标更新
							
							
							
							
							
						 | 
						
							2022-01-07 18:27:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								35aa32fe32
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-07 18:22:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f3e9d3b2a5
								
							
								
							
						 | 
						
							
							
								
								【云游商人】顺序修改
							
							
							
							
							
						 | 
						
							2022-01-07 18:22:23 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								963591b530
								
							
								
							
						 | 
						
							
							
								
								【动画】修复动画导致部分列表显示错误
							
							
							
							
							
						 | 
						
							2022-01-07 18:21:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9e8ff1942f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-07 16:46:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f45ec94ea5
								
							
								
							
						 | 
						
							
							
								
								血条位置修改提交
							
							
							
							
							
						 | 
						
							2022-01-07 16:46:25 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								34e90db4fd
								
							
								
							
						 | 
						
							
							
								
								【编队删选】添加职业筛选效果,高亮效果颜色修改
							
							
							
							
							
						 | 
						
							2022-01-07 16:40:31 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ac0718f8b8
								
							
								
							
						 | 
						
							
							
								
								[战斗]======御甲叠加逻辑修改
							
							
							
							
							
						 | 
						
							2022-01-07 14:19:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								62f7222e1b
								
							
								
							
						 | 
						
							
							
								
								法宝聚灵界面修改提交
							
							
							
							
							
						 | 
						
							2022-01-07 14:03:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								eea23a9dda
								
							
								
							
						 | 
						
							
							
								
								不显示收益修改提交
							
							
							
							
							
						 | 
						
							2022-01-07 13:58:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2c5f9c5473
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-07 13:43:37 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fe4f9fdcf7
								
							
								
							
						 | 
						
							
							
								
								探索地图报错修改
							
							
							
							
							
						 | 
						
							2022-01-07 13:43:07 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								61539a1e89
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-07 11:29:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e16c47a8de
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-07 11:28:58 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								31147f3c0a
								
							
								
							
						 | 
						
							
							
								
								Revert "幸运探宝没开不需要隐藏修改"
							
							
							
							
							
							
							
							This reverts commit 7c44812439. 
							
						 | 
						
							2022-01-07 10:31:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7c44812439
								
							
								
							
						 | 
						
							
							
								
								幸运探宝没开不需要隐藏修改
							
							
							
							
							
						 | 
						
							2022-01-07 10:29:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								082fb392d5
								
							
								
							
						 | 
						
							
							
								
								探索主城异常提交
							
							
							
							
							
						 | 
						
							2022-01-07 10:13:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6d5a716b10
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-06 18:42:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								54b01f4d86
								
							
								
							
						 | 
						
							
							
								
								【家园+易经宝库】提交
							
							
							
							
							
						 | 
						
							2022-01-06 18:42:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c794ab4048
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-06 18:35:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								59bdf19b9e
								
							
								
							
						 | 
						
							
							
								
								主城预设提交
							
							
							
							
							
						 | 
						
							2022-01-06 18:34:48 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a46e3263b7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-06 18:27:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e0c228bf3f
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】提交
							
							
							
							
							
						 | 
						
							2022-01-06 18:27:09 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								79f89d355f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-06 18:26:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b740f2abb7
								
							
								
							
						 | 
						
							
							
								
								探索引导提交
							
							
							
							
							
						 | 
						
							2022-01-06 18:25:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1373efaba8
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁红点修改
							
							
							
							
							
						 | 
						
							2022-01-06 17:59:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								956826c46a
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁提交
							
							
							
							
							
						 | 
						
							2022-01-06 17:53:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								456501e15a
								
							
								
							
						 | 
						
							
							
								
								【礼包】每日礼包 每周礼包 增加礼包名称展示
							
							
							
							
							
						 | 
						
							2022-01-06 17:10:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b99b633f2a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-06 17:04:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0bed9188dc
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁提交
							
							
							
							
							
						 | 
						
							2022-01-06 17:04:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3f6f975310
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-06 16:47:35 +08:00 |