JieLing
							
						 | 
						
							
							
							
							
								
							
								460152864d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/test
							
							
							
							
							
						 | 
						
							2021-07-27 09:45:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								74c713c65b
								
							
								
							
						 | 
						
							
							
								
								【主题活动】加强限时商市,珍奇宝阁入口按钮的辨识度
							
							
							
							
							
						 | 
						
							2021-07-26 19:00:41 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								6da41a152f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/test
							
							
							
							
							
						 | 
						
							2021-07-26 14:21:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								11543e53a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-07-26 11:09:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								beea770b78
								
							
								
							
						 | 
						
							
							
								
								【竞技场】适配调整
							
							
							
							
							
						 | 
						
							2021-07-26 11:09:07 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								47739d4872
								
							
								
							
						 | 
						
							
							
								
								【跨服天梯】主界面按钮添加
							
							
							
							
							
						 | 
						
							2021-07-26 10:39:03 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								55ab6b992e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/test
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
#	Assets/ManagedResources/EffectResUI/ChengHao_new/Textures/Fx_tex_os4_ani_017.png.meta
#	Assets/ManagedResources/EffectResUI/linglongbaojing/Textures/fx_tex_xinguang.png.meta
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua 
							
						 | 
						
							2021-07-26 10:20:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9a1d361c63
								
							
								
							
						 | 
						
							
							
								
								Revert "装备界面改动"
							
							
							
							
							
							
							
							This reverts commit c131d41d58. 
							
						 | 
						
							2021-07-26 10:03:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4590076eb9
								
							
								
							
						 | 
						
							
							
								
								Revert "宝物培养修改提交"
							
							
							
							
							
							
							
							This reverts commit bcd0651029. 
							
						 | 
						
							2021-07-26 10:00:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d53776b558
								
							
								
							
						 | 
						
							
							
								
								Revert "红点修改提交"
							
							
							
							
							
							
							
							This reverts commit 734efe7b52. 
							
						 | 
						
							2021-07-26 10:00:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								734efe7b52
								
							
								
							
						 | 
						
							
							
								
								红点修改提交
							
							
							
							
							
						 | 
						
							2021-07-24 19:36:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fd7d51168d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-07-23 19:12:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								bcd0651029
								
							
								
							
						 | 
						
							
							
								
								宝物培养修改提交
							
							
							
							
							
						 | 
						
							2021-07-23 19:12:42 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								7116d9137d
								
							
								
							
						 | 
						
							
							
								
								【心魔试炼】资源丢失   资源冲突解决提交
							
							
							
							
							
						 | 
						
							2021-07-23 18:54:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								25ace8439d
								
							
								
							
						 | 
						
							
							
								
								【公会】旗帜位置调整
							
							
							
							
							
						 | 
						
							2021-07-23 18:26:28 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3dc2970f1f
								
							
								
							
						 | 
						
							
							
								
								[功能]============15日登陆预告预设修改,整点自动刷新
							
							
							
							
							
						 | 
						
							2021-07-23 16:27:33 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3b15f14d97
								
							
								
							
						 | 
						
							
							
								
								【跨服天梯】世界等级
							
							
							
							
							
						 | 
						
							2021-07-23 15:54:39 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								887f071868
								
							
								
							
						 | 
						
							
							
								
								[功能]============15日登陆预告预设提交
							
							
							
							
							
						 | 
						
							2021-07-23 15:30:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								545e6cd8af
								
							
								
							
						 | 
						
							
							
								
								【跨服天梯】世界等级提交
							
							
							
							
							
						 | 
						
							2021-07-23 15:28:15 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								02cea65055
								
							
								
							
						 | 
						
							
							
								
								[称号]====跨服称号资源提交
							
							
							
							
							
						 | 
						
							2021-07-23 11:20:05 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d0d533cecc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-07-23 11:08:03 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								f7029c2ef0
								
							
								
							
						 | 
						
							
							
								
								[功能]==============15日登陆添加 预告
							
							
							
							
							
						 | 
						
							2021-07-23 11:07:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								6461dbc161
								
							
								
							
						 | 
						
							
							
								
								【灵兽特惠】修复全面屏时间显示位置错误
							
							
							
							
							
						 | 
						
							2021-07-22 20:16:30 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0db39ccbe3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/ios' into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta 
							
						 | 
						
							2021-07-22 19:39:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b0d10a29d2
								
							
								
							
						 | 
						
							
							
								
								【公会】公会按钮位置调整
							
							
							
							
							
						 | 
						
							2021-07-22 17:41:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								056d3dc094
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0优化/副本界面
							
							
							
							
							
						 | 
						
							2021-07-22 17:01:32 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								789c6b3d91
								
							
								
							
						 | 
						
							
							
								
								【新副本界面】上方不可点击修改
							
							
							
							
							
						 | 
						
							2021-07-22 17:01:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								997eae4e2c
								
							
								
							
						 | 
						
							
							
								
								已获得修改提交
							
							
							
							
							
						 | 
						
							2021-07-22 15:48:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								db258d27cb
								
							
								
							
						 | 
						
							
							
								
								【副本界面】调整
							
							
							
							
							
						 | 
						
							2021-07-22 15:13:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								190f3722a8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0优化/副本界面
							
							
							
							
							
						 | 
						
							2021-07-22 14:04:11 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5fa9f25c09
								
							
								
							
						 | 
						
							
							
								
								【点将台】白片修改
							
							
							
							
							
						 | 
						
							2021-07-22 10:53:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b7d7b3270a
								
							
								
							
						 | 
						
							
							
								
								【主题活动】分页处理
							
							
							
							
							
						 | 
						
							2021-07-22 10:36:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2bf92fdfdd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-07-21 18:37:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								683e0eefc4
								
							
								
							
						 | 
						
							
							
								
								【心愿抽卡】界面调整
							
							
							
							
							
						 | 
						
							2021-07-21 18:37:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5150fd2edf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-07-21 18:27:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c131d41d58
								
							
								
							
						 | 
						
							
							
								
								装备界面改动
							
							
							
							
							
						 | 
						
							2021-07-21 18:27:03 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								30edf664da
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0优化/新增心愿神将提示
							
							
							
							
							
						 | 
						
							2021-07-21 18:26:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								183cd238d3
								
							
								
							
						 | 
						
							
							
								
								【心愿抽卡】完成
							
							
							
							
							
						 | 
						
							2021-07-21 18:22:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1d2ed2a4f7
								
							
								
							
						 | 
						
							
							
								
								装备详情弹窗下方获取途径位置显示错误
							
							
							
							
							
						 | 
						
							2021-07-21 18:03:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8477043738
								
							
								
							
						 | 
						
							
							
								
								装备详情弹窗下方获取途径位置显示错误
							
							
							
							
							
						 | 
						
							2021-07-21 17:38:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b0e53312e7
								
							
								
							
						 | 
						
							
							
								
								【心愿抽卡】增加英雄加入卡池的天数条件
							
							
							
							
							
						 | 
						
							2021-07-21 17:35:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								399d90809d
								
							
								
							
						 | 
						
							
							
								
								装备详情弹窗下方获取途径位置显示错误
							
							
							
							
							
						 | 
						
							2021-07-21 17:32:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d1abaf403c
								
							
								
							
						 | 
						
							
							
								
								装备详情弹窗下方获取途径位置显示错误
							
							
							
							
							
						 | 
						
							2021-07-21 17:23:14 +08:00 | 
						
					
				
					
						
							
							
								 
								JLIOSM1
							
						 | 
						
							
							
							
							
								
							
								d680e5a507
								
							
								
							
						 | 
						
							
							
								
								Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua.meta
#	Assets/StreamingAssets/Res/PackConfig.txt
#	Assets/StreamingAssets/Res/_ReadMe.md
#	Assets/StreamingAssets/Res/dl_ui_effect_bg.png
#	Assets/StreamingAssets/Res/dl_ui_effect_bg.png.meta
#	Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png
#	Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png.meta
#	Assets/StreamingAssets/Res/loading1.png
#	Assets/StreamingAssets/Res/loading1.png.meta
#	Assets/StreamingAssets/Res/loading2.png
#	Assets/StreamingAssets/Res/loading2.png.meta
#	Assets/StreamingAssets/Res/loading3.png
#	Assets/StreamingAssets/Res/loading3.png.meta
#	Assets/StreamingAssets/Res/loading4.png
#	Assets/StreamingAssets/Res/loading4.png.meta
#	Assets/StreamingAssets/Res/loading5.png
#	Assets/StreamingAssets/Res/loading5.png.meta
#	Assets/StreamingAssets/Res/loading6.png
#	Assets/StreamingAssets/Res/loading6.png.meta
#	Assets/StreamingAssets/Res/loading_caohua.png.meta
#	Assets/StreamingAssets/Res/loading_xipu.png.meta
#	Assets/StreamingAssets/Res/login_caohua.png.meta
#	Assets/StreamingAssets/Res/login_video.mp4.meta
#	Assets/StreamingAssets/Res/login_xipu.png.meta 
							
						 | 
						
							2021-07-21 17:15:36 +08:00 | 
						
					
				
					
						
							
							
								 
								JLIOSM1
							
						 | 
						
							
							
							
							
								
							
								557d19910d
								
							
								
							
						 | 
						
							
							
								
								【屏幕适配】优化剧情界面在宽屏设备下的显示
							
							
							
							
							
						 | 
						
							2021-07-21 11:30:13 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a359ff284f
								
							
								
							
						 | 
						
							
							
								
								【跨服主城按钮修改】
							
							
							
							
							
						 | 
						
							2021-07-20 18:32:02 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b395410ac1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/dev_c_跨服天梯
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset 
							
						 | 
						
							2021-07-20 18:09:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7cf1150c52
								
							
								
							
						 | 
						
							
							
								
								四元阵预设修改提交
							
							
							
							
							
						 | 
						
							2021-07-20 12:37:14 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								38d384e9a7
								
							
								
							
						 | 
						
							
							
								
								[bug]=========【ID1017466】
							
							
							
							
							
							
							
							【首充按钮】武将预览修改成神将预览 
							
						 | 
						
							2021-07-19 17:34:04 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								9a65f93211
								
							
								
							
						 | 
						
							
							
								
								玲珑宝镜修改
							
							
							
							
							
						 | 
						
							2021-07-16 19:12:35 +08:00 |