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
							
						 | 
						
							
							
							
							
								
							
								8232879006
								
							
								
							
						 | 
						
							
							
								
								车迟排名界面调整、日常本底部适配、万象境“新”字bug修复
							
							
							
							
							
						 | 
						
							2020-09-04 14:30:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1c59eb5ff4
								
							
								
							
						 | 
						
							
							
								
								编队提示文字适配
							
							
							
							
							
						 | 
						
							2020-09-04 11:33:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								30697705be
								
							
								
							
						 | 
						
							
							
								
								每次销毁界面时清理一次不用的资源,界面打开音效配置添加
							
							
							
							
							
						 | 
						
							2020-09-04 10:03:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ca036d6d0a
								
							
								
							
						 | 
						
							
							
								
								天宫商店、无尽商店货币加号增加、无尽副本战斗胜利不显示经验
							
							
							
							
							
						 | 
						
							2020-09-03 18:16:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0d6c12bd58
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 16:51:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ce9ca7937a
								
							
								
							
						 | 
						
							
							
								
								无尽副本剩余行动力微调
							
							
							
							
							
						 | 
						
							2020-09-03 16:51:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a372dd7a5e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-10 16:32:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2f9c449e31
								
							
								
							
						 | 
						
							
							
								
								新手引导预设修改
							
							
							
							
							
						 | 
						
							2020-09-10 16:32:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dbb941851c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 16:30:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c51e180255
								
							
								
							
						 | 
						
							
							
								
								十绝阵界面适配调整、修改排行单位错误
							
							
							
							
							
						 | 
						
							2020-09-03 16:30:28 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								352f338abe
								
							
								
							
						 | 
						
							
							
								
								界面战力不一致
							
							
							
							
							
						 | 
						
							2020-09-03 16:03:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2612f04dc4
								
							
								
							
						 | 
						
							
							
								
								shipei
							
							
							
							
							
						 | 
						
							2020-09-03 16:24:04 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2f32484379
								
							
								
							
						 | 
						
							
							
								
								shipei
							
							
							
							
							
						 | 
						
							2020-09-03 16:19:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								854404515d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 14:07:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b6c47a3762
								
							
								
							
						 | 
						
							
							
								
								当车迟抢夺编队为空时前端直接弹结果
							
							
							
							
							
						 | 
						
							2020-09-03 15:58:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e9e6378995
								
							
								
							
						 | 
						
							
							
								
								general_bomb 适配调整
							
							
							
							
							
						 | 
						
							2020-09-03 14:07:02 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								71851d1662
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-03 11:37:40 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bc982203a8
								
							
								
							
						 | 
						
							
							
								
								界面适配调整
							
							
							
							
							
						 | 
						
							2020-09-03 11:37:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c3b0f590d2
								
							
								
							
						 | 
						
							
							
								
								好友增加一键领取红点
							
							
							
							
							
						 | 
						
							2020-09-03 10:50:25 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								6e400a4db1
								
							
								
							
						 | 
						
							
							
								
								屏幕适配提交
							
							
							
							
							
						 | 
						
							2020-09-02 22:29:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								315c9b864a
								
							
								
							
						 | 
						
							
							
								
								屏幕适配
							
							
							
							
							
						 | 
						
							2020-09-02 20:46:21 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b3dab63ca4
								
							
								
							
						 | 
						
							
							
								
								屏幕适配修改
							
							
							
							
							
						 | 
						
							2020-09-02 20:27:21 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b2d9620c73
								
							
								
							
						 | 
						
							
							
								
								界面适配修改
							
							
							
							
							
						 | 
						
							2020-09-02 19:30:56 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9473b158e4
								
							
								
							
						 | 
						
							
							
								
								释放技能逻辑修改,如果角色在释放技能前死了就把队列里要释放的技能都不做处理,只有死亡后才触发的技能才会释放和有不灭的英雄的技能
							
							
							
							
							
						 | 
						
							2020-09-02 19:01:11 +09:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5959deaefa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-02 18:33:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3c0c8e3f15
								
							
								
							
						 | 
						
							
							
								
								【页签优化】部分页签设定按照玩家等级开启
							
							
							
							
							
						 | 
						
							2020-09-02 18:33:17 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4c000c6cb3
								
							
								
							
						 | 
						
							
							
								
								shipei
							
							
							
							
							
						 | 
						
							2020-09-02 18:27:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2b33e3859b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-02 18:07:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b7abe8edd6
								
							
								
							
						 | 
						
							
							
								
								hero compound
							
							
							
							
							
						 | 
						
							2020-09-02 18:07:20 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ef1b812ebd
								
							
								
							
						 | 
						
							
							
								
								shipei
							
							
							
							
							
						 | 
						
							2020-09-02 18:02:52 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d40da31aad
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua 
							
						 | 
						
							2020-09-02 18:01:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7342bc3bd9
								
							
								
							
						 | 
						
							
							
								
								commit
							
							
							
							
							
						 | 
						
							2020-09-02 17:59:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								571b8e082a
								
							
								
							
						 | 
						
							
							
								
								shipei
							
							
							
							
							
						 | 
						
							2020-09-02 17:38:56 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3df07f557c
								
							
								
							
						 | 
						
							
							
								
								合成界面屏幕适配修改
							
							
							
							
							
						 | 
						
							2020-09-02 17:31:49 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b97569c645
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-02 17:22:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d2e94cfdea
								
							
								
							
						 | 
						
							
							
								
								hero compound and replace
							
							
							
							
							
						 | 
						
							2020-09-02 17:21:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e415076e53
								
							
								
							
						 | 
						
							
							
								
								主界面适配资源替换
							
							
							
							
							
						 | 
						
							2020-09-02 17:04:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3104734cfe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-02 16:46:47 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ae1ed4b001
								
							
								
							
						 | 
						
							
							
								
								月卡界面屏幕适配修改,
							
							
							
							
							
						 | 
						
							2020-09-02 16:46:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								88456863c2
								
							
								
							
						 | 
						
							
							
								
								shipei
							
							
							
							
							
						 | 
						
							2020-09-02 16:44:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								541d4277c7
								
							
								
							
						 | 
						
							
							
								
								部分界面屏幕适配修改
							
							
							
							
							
						 | 
						
							2020-09-02 16:11:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								58540f1556
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-02 16:10:40 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								926f8d7669
								
							
								
							
						 | 
						
							
							
								
								一件添加好友和添加界面调整
							
							
							
							
							
						 | 
						
							2020-09-02 16:10:32 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								939e9b3c77
								
							
								
							
						 | 
						
							
							
								
								shi pei
							
							
							
							
							
						 | 
						
							2020-09-02 15:54:28 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1f3ba7abf7
								
							
								
							
						 | 
						
							
							
								
								充值,首充,幸运探宝界面适配修改
							
							
							
							
							
						 | 
						
							2020-09-02 14:44:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8c8697d31d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-02 14:19:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7563aad66f
								
							
								
							
						 | 
						
							
							
								
								活动界面适配调整
							
							
							
							
							
						 | 
						
							2020-09-02 14:19:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								aeb70ab707
								
							
								
							
						 | 
						
							
							
								
								dainfengsai
							
							
							
							
							
						 | 
						
							2020-09-02 14:16:06 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1908ce2ee8
								
							
								
							
						 | 
						
							
							
								
								破阵诛仙
							
							
							
							
							
						 | 
						
							2020-09-02 14:07:57 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9d757ba068
								
							
								
							
						 | 
						
							
							
								
								适配
							
							
							
							
							
						 | 
						
							2020-09-02 13:45:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								39e9728561
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab 
							
						 | 
						
							2020-09-02 13:36:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8b60b15dd6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-09 10:31:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8d11549d86
								
							
								
							
						 | 
						
							
							
								
								大闹天宫红点修改
							
							
							
							
							
						 | 
						
							2020-09-09 10:30:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								730c2719a5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-09 10:11:52 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8d19f5c583
								
							
								
							
						 | 
						
							
							
								
								prefab commit
							
							
							
							
							
						 | 
						
							2020-09-09 10:11:47 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e3e95e2379
								
							
								
							
						 | 
						
							
							
								
								森罗 无尽 流程优化和界面调整
							
							
							
							
							
						 | 
						
							2020-09-02 13:35:29 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								13ab0dc54f
								
							
								
							
						 | 
						
							
							
								
								小弹窗界面屏幕适配修改
							
							
							
							
							
						 | 
						
							2020-09-02 10:29:55 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e845bc5fe1
								
							
								
							
						 | 
						
							
							
								
								车迟  十绝阵 英雄详情 适配
							
							
							
							
							
						 | 
						
							2020-09-02 09:49:17 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e5dd48c072
								
							
								
							
						 | 
						
							
							
								
								shipei
							
							
							
							
							
						 | 
						
							2020-09-01 19:53:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								933aadbf65
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-01 18:36:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								00b75cc097
								
							
								
							
						 | 
						
							
							
								
								prefab commit
							
							
							
							
							
						 | 
						
							2020-09-01 18:36:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f68a1b868a
								
							
								
							
						 | 
						
							
							
								
								四元阵 抽卡 兽潮主
							
							
							
							
							
						 | 
						
							2020-09-01 17:35:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								68f9b89773
								
							
								
							
						 | 
						
							
							
								
								loadingpanel界面适配调整
							
							
							
							
							
						 | 
						
							2020-09-01 17:13:30 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								97eaf77009
								
							
								
							
						 | 
						
							
							
								
								主界面底部界面经验条显示调整
							
							
							
							
							
						 | 
						
							2020-09-01 17:12:00 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								eeecbca77a
								
							
								
							
						 | 
						
							
							
								
								部分界面适配调整
							
							
							
							
							
						 | 
						
							2020-09-01 16:56:45 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								c4bc262356
								
							
								
							
						 | 
						
							
							
								
								图鉴 编队 开服
							
							
							
							
							
						 | 
						
							2020-09-01 16:54:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ad887c2b7f
								
							
								
							
						 | 
						
							
							
								
								添加全屏显示的ui父节点,并将所有弹窗都放入该节点
							
							
							
							
							
						 | 
						
							2020-09-01 16:10:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4dbbdbd54b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-09-01 14:53:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								822f4a2294
								
							
								
							
						 | 
						
							
							
								
								森罗界面适配
							
							
							
							
							
						 | 
						
							2020-09-01 14:53:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c6bdebeffb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab 
							
						 | 
						
							2020-09-01 14:38:29 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ae349123df
								
							
								
							
						 | 
						
							
							
								
								部分界面屏幕适配调整
							
							
							
							
							
						 | 
						
							2020-09-01 14:38:02 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								aabef68ccb
								
							
								
							
						 | 
						
							
							
								
								气泡提交
							
							
							
							
							
						 | 
						
							2020-09-01 11:50:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e74c120d01
								
							
								
							
						 | 
						
							
							
								
								大闹天宫重置红点、无尽副本界面红点
							
							
							
							
							
						 | 
						
							2020-09-01 11:25:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a6fa4453e6
								
							
								
							
						 | 
						
							
							
								
								需求主城或关卡停留过长添加聊天气泡
							
							
							
							
							
						 | 
						
							2020-08-31 20:52:50 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								70a17dc502
								
							
								
							
						 | 
						
							
							
								
								法宝添加红点提示
							
							
							
							
							
						 | 
						
							2020-08-31 19:47:57 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								40610b0c19
								
							
								
							
						 | 
						
							
							
								
								献祭修改
							
							
							
							
							
						 | 
						
							2020-08-31 18:19:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								50dd63cd06
								
							
								
							
						 | 
						
							
							
								
								小游戏18按钮大小调整,前往下一层文字大小修改、
							
							
							
							
							
						 | 
						
							2020-08-31 16:06:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b5ac787e16
								
							
								
							
						 | 
						
							
							
								
								数独小游戏15 1:2屏幕适配错误修复
							
							
							
							
							
							
							
							购买回春散数量不增加修改 
							
						 | 
						
							2020-08-31 15:45:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9fd56a684d
								
							
								
							
						 | 
						
							
							
								
								去除宝箱黑色框
							
							
							
							
							
						 | 
						
							2020-08-31 10:40:23 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								fc9a5341f0
								
							
								
							
						 | 
						
							
							
								
								屏幕适配方式改为按高度适配,修复点击特效位置错误的问题
							
							
							
							
							
						 | 
						
							2020-08-29 17:22:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								628039ab92
								
							
								
							
						 | 
						
							
							
								
								prefab commit
							
							
							
							
							
						 | 
						
							2020-08-29 16:35:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								638022dbad
								
							
								
							
						 | 
						
							
							
								
								【五星成长礼】拍脸图中间“战”字有阴影
							
							
							
							
							
						 | 
						
							2020-08-29 15:17:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								dd1493ee90
								
							
								
							
						 | 
						
							
							
								
								【碎片显示】确认购买和碎片合成时,不显示碎片道具的属性和碎片边框
							
							
							
							
							
						 | 
						
							2020-08-29 15:14:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								01fc7cae51
								
							
								
							
						 | 
						
							
							
								
								森罗幻境奖励红点
							
							
							
							
							
						 | 
						
							2020-08-28 13:48:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c933276cea
								
							
								
							
						 | 
						
							
							
								
								试炼增益添加滑动效果
							
							
							
							
							
						 | 
						
							2020-08-28 00:24:06 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								82606d8fbe
								
							
								
							
						 | 
						
							
							
								
								每日周月礼包根据后端数据判断显隐
							
							
							
							
							
						 | 
						
							2020-08-27 18:35:32 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								82ec03a605
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-27 18:16:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								021a7dc5a7
								
							
								
							
						 | 
						
							
							
								
								森罗换层卡死问题修复
							
							
							
							
							
						 | 
						
							2020-08-27 18:15:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1ce0e4b15c
								
							
								
							
						 | 
						
							
							
								
								战斗怒气文字修改
							
							
							
							
							
						 | 
						
							2020-08-27 17:26:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								09f27f8d3d
								
							
								
							
						 | 
						
							
							
								
								des update
							
							
							
							
							
						 | 
						
							2020-08-27 16:16:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								104311a51a
								
							
								
							
						 | 
						
							
							
								
								prefab commit
							
							
							
							
							
						 | 
						
							2020-08-27 16:07:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ca618e9f33
								
							
								
							
						 | 
						
							
							
								
								add xuanyuan des
							
							
							
							
							
						 | 
						
							2020-08-27 16:05:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								19465ac1b2
								
							
								
							
						 | 
						
							
							
								
								【宝物】共鸣界面等级上限显示不正确
							
							
							
							
							
						 | 
						
							2020-08-27 12:01:01 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								c315cf768d
								
							
								
							
						 | 
						
							
							
								
								竞技场排行
							
							
							
							
							
						 | 
						
							2020-08-27 10:52:35 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								012a01ec20
								
							
								
							
						 | 
						
							
							
								
								移动主界面虚化坛位置
							
							
							
							
							
						 | 
						
							2020-08-26 21:27:58 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								812450c032
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-26 20:56:48 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6dec0b0307
								
							
								
							
						 | 
						
							
							
								
								修改公会技能升级 更新英雄战力
							
							
							
							
							
						 | 
						
							2020-08-26 20:56:28 +08:00 |