wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3e75dc9f6f
								
							
								
							
						 | 
						
							
							
								
								[假战斗]======修改提交
							
							
							
							
							
						 | 
						
							2022-05-24 11:57:47 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e509483e41
								
							
								
							
						 | 
						
							
							
								
								[寻仙招募]=====预设修改
							
							
							
							
							
						 | 
						
							2022-05-23 15:30:58 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e7df09c284
								
							
								
							
						 | 
						
							
							
								
								[寻仙招募]======修改提交
							
							
							
							
							
						 | 
						
							2022-05-23 11:29:10 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								2b75be487d
								
							
								
							
						 | 
						
							
							
								
								天赋按钮位置图片修改
							
							
							
							
							
						 | 
						
							2022-05-19 22:37:52 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5e27a00173
								
							
								
							
						 | 
						
							
							
								
								英雄技能详情修改
							
							
							
							
							
						 | 
						
							2022-05-19 21:33:38 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								6c902c649b
								
							
								
							
						 | 
						
							
							
								
								[首充]=====求掉显示10星属性按钮
							
							
							
							
							
						 | 
						
							2022-05-19 21:13:08 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a368bfa790
								
							
								
							
						 | 
						
							
							
								
								英雄主界面位置调整
							
							
							
							
							
						 | 
						
							2022-05-19 21:00:00 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d97c84a543
								
							
								
							
						 | 
						
							
							
								
								[英雄详情修改i]
							
							
							
							
							
						 | 
						
							2022-05-19 20:43:41 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3b4e771d16
								
							
								
							
						 | 
						
							
							
								
								[神将信息展示]======神将信息修改
							
							
							
							
							
						 | 
						
							2022-05-19 16:38:52 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								0cad7e593a
								
							
								
							
						 | 
						
							
							
								
								终身卡调整
							
							
							
							
							
						 | 
						
							2022-05-21 14:19:59 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								434cba5cc2
								
							
								
							
						 | 
						
							
							
								
								终身卡脚本预设提交
							
							
							
							
							
						 | 
						
							2022-05-19 11:49:56 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								064407ea0f
								
							
								
							
						 | 
						
							
							
								
								终身卡修改提交
							
							
							
							
							
						 | 
						
							2022-05-19 11:29:08 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d4a6bfdda2
								
							
								
							
						 | 
						
							
							
								
								【神将排版优化】========神将信息界面修改
							
							
							
							
							
						 | 
						
							2022-05-18 20:00:57 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								9c9018b1da
								
							
								
							
						 | 
						
							
							
								
								终身卡功能提交
							
							
							
							
							
						 | 
						
							2022-05-18 19:39:19 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4ef723e229
								
							
								
							
						 | 
						
							
							
								
								[神印]====显示修改
							
							
							
							
							
						 | 
						
							2022-05-05 11:52:48 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								25ee0998e7
								
							
								
							
						 | 
						
							
							
								
								一键探索 按钮背景更换
							
							
							
							
							
						 | 
						
							2022-04-28 20:05:23 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								f353cc18eb
								
							
								
							
						 | 
						
							
							
								
								祭品神将选择。【一键选择】、【选定】按钮背景更换
							
							
							
							
							
						 | 
						
							2022-04-28 19:57:15 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								af5f307a49
								
							
								
							
						 | 
						
							
							
								
								鸿蒙阵 解锁玄黄之气 确认按钮背景修改
							
							
							
							
							
						 | 
						
							2022-04-28 19:52:25 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								e810e85e5e
								
							
								
							
						 | 
						
							
							
								
								洞府界面。升级按钮 背景修改
							
							
							
							
							
						 | 
						
							2022-04-28 19:35:57 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								8b67cc01f9
								
							
								
							
						 | 
						
							
							
								
								玉虚论道。按钮背景修改
							
							
							
							
							
						 | 
						
							2022-04-28 19:30:12 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								9db3e7edd9
								
							
								
							
						 | 
						
							
							
								
								更改七界试炼 挑战按钮背景
							
							
							
							
							
						 | 
						
							2022-04-28 19:05:32 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								e852fea1cb
								
							
								
							
						 | 
						
							
							
								
								锻器阁 三个页签【合成】按钮背景更换
							
							
							
							
							
						 | 
						
							2022-04-28 18:58:54 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								845e1d33e5
								
							
								
							
						 | 
						
							
							
								
								修改 千战逐胜台 右侧按钮大小尺寸
							
							
							
							
							
						 | 
						
							2022-04-28 18:42:52 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								716556d9a2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-04-28 18:03:43 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								5188ade977
								
							
								
							
						 | 
						
							
							
								
								修改 千战逐胜台 的【挑战】按钮背景图片,更换了【今日免费挑战次数】的文字描述及位置
							
							
							
							
							
						 | 
						
							2022-04-28 18:03:25 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								9700f316fe
								
							
								
							
						 | 
						
							
							
								
								主城洞府位置修改
							
							
							
							
							
						 | 
						
							2022-04-28 17:17:49 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								672402b37f
								
							
								
							
						 | 
						
							
							
								
								修改山河社稷图中【每日领取/购买】玉衡龙须丹弹窗的领取按钮背景
							
							
							
							
							
						 | 
						
							2022-04-28 16:58:43 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								42613ffc52
								
							
								
							
						 | 
						
							
							
								
								修改山河社稷图三星关卡 及 特殊关卡 【挑战】按钮背景图
							
							
							
							
							
						 | 
						
							2022-04-28 16:47:30 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								2d95eddb30
								
							
								
							
						 | 
						
							
							
								
								主城跨服战竞技场按钮位置调整
							
							
							
							
							
						 | 
						
							2022-04-28 15:20:29 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								0805e5054d
								
							
								
							
						 | 
						
							
							
								
								身外化身界面调整
							
							
							
							
							
						 | 
						
							2022-04-28 11:58:48 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								78bf3d5a7e
								
							
								
							
						 | 
						
							
							
								
								物品详情界面动画修改
							
							
							
							
							
						 | 
						
							2022-04-28 10:16:08 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								d1111be7eb
								
							
								
							
						 | 
						
							
							
								
								化身卡升级升星红点提交
							
							
							
							
							
						 | 
						
							2022-04-27 18:08:55 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ddd2a0c024
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-04-26 18:26:20 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								34685c7cb8
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2022-04-26 18:25:57 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								4199ea504a
								
							
								
							
						 | 
						
							
							
								
								查看其他玩家信息,变身卡信息不对bug
							
							
							
							
							
						 | 
						
							2022-04-26 17:20:19 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								81122369c6
								
							
								
							
						 | 
						
							
							
								
								bug修改提交
							
							
							
							
							
						 | 
						
							2022-04-26 16:09:21 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								84f96972ce
								
							
								
							
						 | 
						
							
							
								
								预设修改提交
							
							
							
							
							
						 | 
						
							2022-04-26 11:51:51 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								565d4007df
								
							
								
							
						 | 
						
							
							
								
								化身之力界面调整
							
							
							
							
							
						 | 
						
							2022-04-25 18:42:19 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								e4e244d36b
								
							
								
							
						 | 
						
							
							
								
								化身界面修改
							
							
							
							
							
						 | 
						
							2022-04-25 18:03:37 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								7c543952e5
								
							
								
							
						 | 
						
							
							
								
								身外化身界面修改
							
							
							
							
							
						 | 
						
							2022-04-25 15:52:46 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								4e5ccff820
								
							
								
							
						 | 
						
							
							
								
								身外化身界面调整
							
							
							
							
							
						 | 
						
							2022-04-25 14:42:17 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								dcf1e29c3a
								
							
								
							
						 | 
						
							
							
								
								界面优化
							
							
							
							
							
						 | 
						
							2022-04-25 11:52:09 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4b9d210499
								
							
								
							
						 | 
						
							
							
								
								屏蔽神阵营,屏蔽招募
							
							
							
							
							
						 | 
						
							2022-04-25 11:31:32 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								160d974cbc
								
							
								
							
						 | 
						
							
							
								
								变身卡界面调整提交
							
							
							
							
							
						 | 
						
							2022-04-24 22:13:28 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								9ec3724c5d
								
							
								
							
						 | 
						
							
							
								
								身外化身界面调整
							
							
							
							
							
						 | 
						
							2022-04-24 20:27:05 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								882f77e164
								
							
								
							
						 | 
						
							
							
								
								界面修改
							
							
							
							
							
						 | 
						
							2022-04-24 19:46:59 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								043f174f08
								
							
								
							
						 | 
						
							
							
								
								神印开始条件显示
							
							
							
							
							
						 | 
						
							2022-04-24 17:19:34 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								26970aee68
								
							
								
							
						 | 
						
							
							
								
								身外化身功能提交
							
							
							
							
							
						 | 
						
							2022-04-24 16:50:24 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e498661919
								
							
								
							
						 | 
						
							
							
								
								神印添加背包分解
							
							
							
							
							
						 | 
						
							2022-04-24 16:36:27 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								7cdf302e90
								
							
								
							
						 | 
						
							
							
								
								神印修改提交
							
							
							
							
							
						 | 
						
							2022-04-24 14:20:11 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								765134f4b3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua 
							
						 | 
						
							2022-04-22 18:33:04 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								c3919b7e82
								
							
								
							
						 | 
						
							
							
								
								变身卡强化相关代码提交
							
							
							
							
							
						 | 
						
							2022-04-22 18:24:33 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ca2b699259
								
							
								
							
						 | 
						
							
							
								
								神印提交
							
							
							
							
							
						 | 
						
							2022-04-22 18:23:01 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ebf73ca029
								
							
								
							
						 | 
						
							
							
								
								神印预设提交
							
							
							
							
							
						 | 
						
							2022-04-22 18:01:00 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								3adb7d0558
								
							
								
							
						 | 
						
							
							
								
								聊天界面优化(更换背景图,对话文字颜色更改、聊天底框更改 )
							
							
							
							
							
						 | 
						
							2022-04-22 16:33:44 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								f620d95f5e
								
							
								
							
						 | 
						
							
							
								
								【tips背板】修改提交
							
							
							
							
							
						 | 
						
							2022-04-22 15:49:52 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								df42d22d4c
								
							
								
							
						 | 
						
							
							
								
								公用背景预设修改提交
							
							
							
							
							
						 | 
						
							2022-04-22 14:07:30 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e4de85a120
								
							
								
							
						 | 
						
							
							
								
								tips背景修改,公用弹窗背景显示修改
							
							
							
							
							
						 | 
						
							2022-04-22 13:09:45 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								8d3062083f
								
							
								
							
						 | 
						
							
							
								
								聊天功能,更换背景图
							
							
							
							
							
						 | 
						
							2022-04-22 10:05:57 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								4f28a4d4c3
								
							
								
							
						 | 
						
							
							
								
								tips界面更换背板 文字配色
							
							
							
							
							
						 | 
						
							2022-04-21 18:03:38 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9999138d97
								
							
								
							
						 | 
						
							
							
								
								[资源]=======新提示背景框提交
							
							
							
							
							
						 | 
						
							2022-04-21 13:41:59 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								dc8704a806
								
							
								
							
						 | 
						
							
							
								
								探索商店跳转入口添加
							
							
							
							
							
						 | 
						
							2022-04-28 10:48:08 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								bf52645eb7
								
							
								
							
						 | 
						
							
							
								
								挑战副本优化
							
							
							
							
							
						 | 
						
							2022-04-25 18:20:53 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								b4a626d9e2
								
							
								
							
						 | 
						
							
							
								
								挑战副本脚本修改提交
							
							
							
							
							
						 | 
						
							2022-04-18 18:48:06 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								9ebdab46b3
								
							
								
							
						 | 
						
							
							
								
								挑战副本相关脚本提交
							
							
							
							
							
						 | 
						
							2022-04-14 16:07:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								17f855be9f
								
							
								
							
						 | 
						
							
							
								
								【ID1011382】
							
							
							
							
							
							
							
							进阶好礼 
							
						 | 
						
							2022-04-02 15:43:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								bfdc6d72b9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-04-02 14:45:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7a1ccac3cd
								
							
								
							
						 | 
						
							
							
								
								【ID1011398】
							
							
							
							
							
							
							
							山河设计图每日玉衡龙魂丹领取调整 
							
						 | 
						
							2022-04-02 14:45:12 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4bb0977391
								
							
								
							
						 | 
						
							
							
								
								[bug]=======bug修改预设提交
							
							
							
							
							
						 | 
						
							2022-04-02 14:33:08 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								eff2800c35
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-03-31 09:51:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4252fde78f
								
							
								
							
						 | 
						
							
							
								
								【ID1011380】
							
							
							
							
							
							
							
							装备和宝石属性修正
(cherry picked from commit 2f54afd172d5da2223cd5e5f8a5cc26b430985ae) 
							
						 | 
						
							2022-03-30 13:40:37 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								857a23aea8
								
							
								
							
						 | 
						
							
							
								
								【ID1011391】
							
							
							
							
							
							
							
							飞升鸿蒙阵等级限制调整
(cherry picked from commit 7dc728ef802a75a0d5d0c67907429f43c01befde) 
							
						 | 
						
							2022-03-29 16:26:06 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9f2b6a80b5
								
							
								
							
						 | 
						
							
							
								
								[功能]=======命石显示修改
							
							
							
							
							
						 | 
						
							2022-03-29 15:49:54 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								57812ad22f
								
							
								
							
						 | 
						
							
							
								
								[功能]=======命石修改,建木神树修改
							
							
							
							
							
						 | 
						
							2022-03-29 15:28:56 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a13dd2939a
								
							
								
							
						 | 
						
							
							
								
								[功能]================神系英雄添加提叫
							
							
							
							
							
						 | 
						
							2022-03-28 18:18:19 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								c593cdf2d6
								
							
								
							
						 | 
						
							
							
								
								[bug]======寻宝特效穿透修改
							
							
							
							
							
						 | 
						
							2022-03-25 14:12:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b57a82309b
								
							
								
							
						 | 
						
							
							
								
								山河试炼修改提交
							
							
							
							
							
						 | 
						
							2022-03-21 17:21:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								096845f8ad
								
							
								
							
						 | 
						
							
							
								
								【ID1011356】
							
							
							
							
							
							
							
							山河试炼添加引导 
							
						 | 
						
							2022-03-21 11:04:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								18803bfc29
								
							
								
							
						 | 
						
							
							
								
								东海寻仙提交
							
							
							
							
							
						 | 
						
							2022-03-18 13:25:09 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								31b1721510
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2022-03-17 15:21:08 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								008b3671c4
								
							
								
							
						 | 
						
							
							
								
								[战斗]======buff提示文字修改
							
							
							
							
							
						 | 
						
							2022-03-14 17:10:15 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d6fc62cfd5
								
							
								
							
						 | 
						
							
							
								
								【修行】======修行界面技能显示修改
							
							
							
							
							
						 | 
						
							2022-03-14 14:07:51 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								43dc67acba
								
							
								
							
						 | 
						
							
							
								
								鸿蒙阵文字修改提交
							
							
							
							
							
						 | 
						
							2022-03-10 17:40:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fd0ee200ac
								
							
								
							
						 | 
						
							
							
								
								【ID1011218】
							
							
							
							
							
							
							
							天书秘卷功能图标位置调整 
							
						 | 
						
							2022-03-10 16:15:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								58c7fd9946
								
							
								
							
						 | 
						
							
							
								
								【ID1011218】
							
							
							
							
							
							
							
							天书秘卷功能图标位置调整 
							
						 | 
						
							2022-03-10 13:48:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e5dde41cda
								
							
								
							
						 | 
						
							
							
								
								【ID1011337】
							
							
							
							
							
							
							
							【优化】车迟斗法抢夺目标 ,玩家积分显示
【ID1011218】
天书秘卷功能图标位置调整 
							
						 | 
						
							2022-03-10 13:45:12 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								5a416c5149
								
							
								
							
						 | 
						
							
							
								
								【车迟斗法】工会界面倒计时
							
							
							
							
							
						 | 
						
							2022-03-03 13:30:25 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								5d4e85832d
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】提交
							
							
							
							
							
						 | 
						
							2022-03-03 09:53:22 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8558152b29
								
							
								
							
						 | 
						
							
							
								
								【立绘】东华帝君,孟婆立绘回归
							
							
							
							
							
						 | 
						
							2022-03-02 19:00:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a01a70e9bb
								
							
								
							
						 | 
						
							
							
								
								红点提交
							
							
							
							
							
						 | 
						
							2022-03-02 18:09:49 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3b0871ad17
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-03-02 18:08:56 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6b4cf31c3c
								
							
								
							
						 | 
						
							
							
								
								【ID1011205】
							
							
							
							
							
							
							
							山河试炼调整到第一周开启,限时14天,投定向将 
							
						 | 
						
							2022-03-02 17:48:52 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								0048bf4e79
								
							
								
							
						 | 
						
							
							
								
								【易经宝库】显示特效
							
							
							
							
							
						 | 
						
							2022-03-02 16:37:22 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								d33dcb9f97
								
							
								
							
						 | 
						
							
							
								
								【装备】装备添加快捷入口到摘星阁
							
							
							
							
							
						 | 
						
							2022-03-02 14:15:13 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								9a60ee25f1
								
							
								
							
						 | 
						
							
							
								
								【战力冲刺】底部页签剧中
							
							
							
							
							
						 | 
						
							2022-02-25 15:52:18 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								2bb1f6a944
								
							
								
							
						 | 
						
							
							
								
								【战力冲刺】提交
							
							
							
							
							
						 | 
						
							2022-02-25 13:14:37 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								6f5aad16b3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-02-24 18:19:50 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								1ae90cb549
								
							
								
							
						 | 
						
							
							
								
								【战力冲刺】修改提交
							
							
							
							
							
						 | 
						
							2022-02-24 18:19:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d0720e17b2
								
							
								
							
						 | 
						
							
							
								
								【ID1011178】
							
							
							
							
							
							
							
							至尊降世活动拉到1000档 
							
						 | 
						
							2022-02-23 17:24:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1905b3c175
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-02-21 18:37:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3ccf3c29a3
								
							
								
							
						 | 
						
							
							
								
								ID1011149】
							
							
							
							
							
							
							
							【优化】升星操作增加鸿蒙阵等级限制 
							
						 | 
						
							2022-02-21 18:36:21 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								9345c31d8b
								
							
								
							
						 | 
						
							
							
								
								【战力冲刺】提交
							
							
							
							
							
						 | 
						
							2022-02-21 10:40:27 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								b51c7b7780
								
							
								
							
						 | 
						
							
							
								
								【战力冲刺】提交
							
							
							
							
							
						 | 
						
							2022-02-18 17:02:27 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								4ca27d13ad
								
							
								
							
						 | 
						
							
							
								
								【战力冲刺】提交
							
							
							
							
							
						 | 
						
							2022-02-18 16:27:49 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								fe6547358c
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】珍奇宝阁提交
							
							
							
							
							
						 | 
						
							2022-02-18 15:19:37 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								f9fca9ca93
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-02-17 17:14:46 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								14af727eab
								
							
								
							
						 | 
						
							
							
								
								【战力冲刺】提交
							
							
							
							
							
						 | 
						
							2022-02-17 16:27:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a76616df31
								
							
								
							
						 | 
						
							
							
								
								【ID1011149】
							
							
							
							
							
							
							
							【优化】升星操作增加鸿蒙阵等级限制 
							
						 | 
						
							2022-02-17 15:13:26 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d03215cc16
								
							
								
							
						 | 
						
							
							
								
								[资源]========神菩提提交
							
							
							
							
							
							
							
							(cherry picked from commit fb9ad83e40f24e680cbc395ba82f777db7422e7e) 
							
						 | 
						
							2022-02-17 10:40:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bfbc3b7195
								
							
								
							
						 | 
						
							
							
								
								【拍脸】寻仙招募界面显示错误修改
							
							
							
							
							
						 | 
						
							2022-02-24 16:49:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								545e06c474
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/寻仙招募拍脸' into china/dev
							
							
							
							
							
						 | 
						
							2022-02-24 15:57:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2342bd8af8
								
							
								
							
						 | 
						
							
							
								
								【拍脸】寻仙招募拍脸添加
							
							
							
							
							
						 | 
						
							2022-02-23 18:08:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5cf3527762
								
							
								
							
						 | 
						
							
							
								
								【资源】特惠商城资源替换
							
							
							
							
							
						 | 
						
							2022-02-23 18:37:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e27c51ee93
								
							
								
							
						 | 
						
							
							
								
								超值返利提交
							
							
							
							
							
						 | 
						
							2022-02-11 15:57:58 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f8d55e0138
								
							
								
							
						 | 
						
							
							
								
								预设漏提
							
							
							
							
							
						 | 
						
							2022-02-11 15:09:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								072edac018
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-02-11 11:26:51 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7e62f47ca8
								
							
								
							
						 | 
						
							
							
								
								【ID1011130】
							
							
							
							
							
							
							
							【活动优化】超值返利 
							
						 | 
						
							2022-02-11 11:26:34 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								9ba115e464
								
							
								
							
						 | 
						
							
							
								
								【每日特惠修改】
							
							
							
							
							
						 | 
						
							2022-02-11 10:35:42 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								b868d5ff2f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-02-10 17:53:20 +08:00 | 
						
					
				
					
						
							
							
								 
								张彪
							
						 | 
						
							
							
							
							
								
							
								4659ad0f84
								
							
								
							
						 | 
						
							
							
								
								【活动优化】每日特惠优化
							
							
							
							
							
						 | 
						
							2022-02-10 17:53:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								bd5d09def0
								
							
								
							
						 | 
						
							
							
								
								【ID1011132】
							
							
							
							
							
							
							
							【活动优化】每日豪礼 
							
						 | 
						
							2022-02-10 16:49:21 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e21fec89ac
								
							
								
							
						 | 
						
							
							
								
								[图鉴]===============图鉴角色信息面板预设修改
							
							
							
							
							
						 | 
						
							2022-02-08 17:30:52 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9e73d667a2
								
							
								
							
						 | 
						
							
							
								
								[战斗]========加御甲显示修改
							
							
							
							
							
						 | 
						
							2022-01-24 16:20:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5eca555299
								
							
								
							
						 | 
						
							
							
								
								浮生门按钮层级修改提交
							
							
							
							
							
						 | 
						
							2022-01-24 16:07:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0fea3d1fd4
								
							
								
							
						 | 
						
							
							
								
								节日修改提交
							
							
							
							
							
						 | 
						
							2022-01-22 14:37:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e3a44ff121
								
							
								
							
						 | 
						
							
							
								
								适配修改提交
							
							
							
							
							
						 | 
						
							2022-01-22 13:50:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a44233c365
								
							
								
							
						 | 
						
							
							
								
								节日提交
							
							
							
							
							
						 | 
						
							2022-01-22 13:34:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ec7be4c020
								
							
								
							
						 | 
						
							
							
								
								节日提交
							
							
							
							
							
						 | 
						
							2022-01-22 13:27:25 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5cea36a143
								
							
								
							
						 | 
						
							
							
								
								节日修改提交
							
							
							
							
							
						 | 
						
							2022-01-22 11:37:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								227e0f68c1
								
							
								
							
						 | 
						
							
							
								
								特效提交
							
							
							
							
							
						 | 
						
							2022-01-22 11:12:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3a9acbdf19
								
							
								
							
						 | 
						
							
							
								
								签到好礼提交
							
							
							
							
							
						 | 
						
							2022-01-21 18:49:40 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1f4c38a710
								
							
								
							
						 | 
						
							
							
								
								显示修改
							
							
							
							
							
						 | 
						
							2022-01-21 14:27:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4c00b471ad
								
							
								
							
						 | 
						
							
							
								
								【战斗】添加头像显示
							
							
							
							
							
						 | 
						
							2022-01-21 11:59:19 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								7de5fdac9e
								
							
								
							
						 | 
						
							
							
								
								[飞升]=====特效问题修改
							
							
							
							
							
						 | 
						
							2022-01-20 17:58:57 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								69a1e5bca6
								
							
								
							
						 | 
						
							
							
								
								【公会成员信息界面修改】
							
							
							
							
							
						 | 
						
							2022-01-20 17:50:35 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								46f337312e
								
							
								
							
						 | 
						
							
							
								
								[飞升]========特效修改
							
							
							
							
							
						 | 
						
							2022-01-20 15:06:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6ff00013f5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-20 11:55:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7d5c79b514
								
							
								
							
						 | 
						
							
							
								
								【排行榜】卡动画修改
							
							
							
							
							
						 | 
						
							2022-01-20 11:52:26 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e734c4a03d
								
							
								
							
						 | 
						
							
							
								
								[飞升]=======飞升修改
							
							
							
							
							
						 | 
						
							2022-01-20 11:41:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								908cee1961
								
							
								
							
						 | 
						
							
							
								
								【神将信息】图鉴信息便宜修改
							
							
							
							
							
						 | 
						
							2022-01-19 18:30:09 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								109648ae93
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/飞升
							
							
							
							
							
						 | 
						
							2022-01-19 16:13:20 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4034a90a33
								
							
								
							
						 | 
						
							
							
								
								[飞升]======优化修改提交
							
							
							
							
							
						 | 
						
							2022-01-19 15:29:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								76295739f3
								
							
								
							
						 | 
						
							
							
								
								【ID1019513】
							
							
							
							
							
							
							
							【品质调整】神将技能弹窗,不关闭也可以点返回 
							
						 | 
						
							2022-01-18 15:01:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b5cc0635ae
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2022-01-18 14:49:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ac24c2e0ce
								
							
								
							
						 | 
						
							
							
								
								【ID1010998】
							
							
							
							
							
							
							
							【春节活动】签到领奖活动 
							
						 | 
						
							2022-01-18 14:48:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								54aeaa2ea8
								
							
								
							
						 | 
						
							
							
								
								【寻仙招募】提交
							
							
							
							
							
						 | 
						
							2022-01-18 12:09:43 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ff5866e00e
								
							
								
							
						 | 
						
							
							
								
								[法宝详情]=======添加返回按钮
							
							
							
							
							
						 | 
						
							2022-01-18 11:57:38 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4298209c33
								
							
								
							
						 | 
						
							
							
								
								[战斗]=======护盾buff修改
							
							
							
							
							
						 | 
						
							2022-01-18 11:44:36 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								7f9868ca59
								
							
								
							
						 | 
						
							
							
								
								[bug]=====奖池预览修改,图鉴详情添加点击反馈
							
							
							
							
							
						 | 
						
							2022-01-18 10:45:39 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a6e05ae8e8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/飞升
							
							
							
							
							
							
							
							Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2022-01-18 09:53:04 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								2e0bd1ded7
								
							
								
							
						 | 
						
							
							
								
								[飞升]=======显示修改
							
							
							
							
							
						 | 
						
							2022-01-18 09:47:38 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								1de7293630
								
							
								
							
						 | 
						
							
							
								
								[飞升]======卡牌飞升预设修改
							
							
							
							
							
						 | 
						
							2022-01-17 16:53:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b7055edd5e
								
							
								
							
						 | 
						
							
							
								
								【图鉴】神将信息屏幕适配修改
							
							
							
							
							
						 | 
						
							2022-01-17 16:08:52 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d5fd95373f
								
							
								
							
						 | 
						
							
							
								
								[抽卡奖池]======抽卡奖池预览修改
							
							
							
							
							
						 | 
						
							2022-01-17 15:56:27 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								f257bc2c6d
								
							
								
							
						 | 
						
							
							
								
								[图鉴]=====图鉴神魂按钮显示修改
							
							
							
							
							
						 | 
						
							2022-01-17 14:26:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e3196e3ca2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-17 13:16:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								409836ffb5
								
							
								
							
						 | 
						
							
							
								
								【名望礼包】提交
							
							
							
							
							
						 | 
						
							2022-01-17 13:16:18 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								6be87dec74
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/飞升
							
							
							
							
							
						 | 
						
							2022-01-17 11:00:42 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								51d1f9e5a7
								
							
								
							
						 | 
						
							
							
								
								【图鉴】======图鉴列表界面预设修改
							
							
							
							
							
						 | 
						
							2022-01-17 10:58:36 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a7ad2ee1f6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/飞升
							
							
							
							
							
						 | 
						
							2022-01-17 10:50:14 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								082afa8466
								
							
								
							
						 | 
						
							
							
								
								【飞升】=====角色主界面修改
							
							
							
							
							
						 | 
						
							2022-01-17 10:47:15 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								21e77fe60b
								
							
								
							
						 | 
						
							
							
								
								[图鉴]=======图鉴详情预设修改
							
							
							
							
							
						 | 
						
							2022-01-17 10:45:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e93b2816b4
								
							
								
							
						 | 
						
							
							
								
								【摘星阁】装备摘星阁属性拆分
							
							
							
							
							
						 | 
						
							2022-01-17 10:24:27 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9357e70d42
								
							
								
							
						 | 
						
							
							
								
								[角色信息]======名字位置修改
							
							
							
							
							
						 | 
						
							2022-01-15 18:44:08 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								0b3007a9c7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/飞升
							
							
							
							
							
							
							
							Conflicts:
	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2022-01-15 18:16:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e67ea3ae70
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-15 17:34:26 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b96aa3851c
								
							
								
							
						 | 
						
							
							
								
								【好感度】提交
							
							
							
							
							
						 | 
						
							2022-01-15 17:34:18 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								1d170dfd2d
								
							
								
							
						 | 
						
							
							
								
								[图鉴]==========图鉴详情修改提交
							
							
							
							
							
						 | 
						
							2022-01-15 17:12:40 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3ad8b6b6c3
								
							
								
							
						 | 
						
							
							
								
								【玩家信息】提交
							
							
							
							
							
						 | 
						
							2022-01-15 15:44:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c373f8d014
								
							
								
							
						 | 
						
							
							
								
								【修改】提交
							
							
							
							
							
						 | 
						
							2022-01-15 15:05:26 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f4c1b9d097
								
							
								
							
						 | 
						
							
							
								
								【修改】提交
							
							
							
							
							
						 | 
						
							2022-01-15 14:34:55 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								fa1c832170
								
							
								
							
						 | 
						
							
							
								
								【坐骑】增加详细信息
							
							
							
							
							
						 | 
						
							2022-01-15 13:00:45 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ef0a0ff436
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/飞升
							
							
							
							
							
							
							
							Conflicts:
	Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
	Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua 
							
						 | 
						
							2022-01-15 12:47:22 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								853fde91b2
								
							
								
							
						 | 
						
							
							
								
								[飞升]============飞升修改提交
							
							
							
							
							
						 | 
						
							2022-01-15 12:26:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								232491eb95
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0优化/玩家信息界面拓展
							
							
							
							
							
						 | 
						
							2022-01-15 09:14:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9f5addf443
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-14 19:14:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								98f23e56ea
								
							
								
							
						 | 
						
							
							
								
								神将修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 19:13:46 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								c2c9eda981
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-14 18:50:17 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								05377b9595
								
							
								
							
						 | 
						
							
							
								
								[图鉴]==== 图鉴  图鉴详情界面修改
							
							
							
							
							
						 | 
						
							2022-01-14 18:49:49 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b0611db595
								
							
								
							
						 | 
						
							
							
								
								神将技能修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 18:48:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ea69ec6643
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-14 17:59:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								81ce84e7be
								
							
								
							
						 | 
						
							
							
								
								升级修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 17:57:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cbea9006b3
								
							
								
							
						 | 
						
							
							
								
								【家园】资源替换
							
							
							
							
							
						 | 
						
							2022-01-14 17:38:46 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dddbe9f223
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-14 17:20:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9ec22eee1f
								
							
								
							
						 | 
						
							
							
								
								【好感度】引导
							
							
							
							
							
						 | 
						
							2022-01-14 17:20:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c11db3056f
								
							
								
							
						 | 
						
							
							
								
								神将修改
							
							
							
							
							
						 | 
						
							2022-01-14 17:13:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0189f5c742
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-14 16:15:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3f267894a8
								
							
								
							
						 | 
						
							
							
								
								神将修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 16:14:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8f554eca59
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0优化/玩家信息界面拓展
							
							
							
							
							
						 | 
						
							2022-01-14 16:02:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1c827a3a23
								
							
								
							
						 | 
						
							
							
								
								【关卡】有可挑战关卡时添加小手显示
							
							
							
							
							
						 | 
						
							2022-01-14 16:02:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								28d3f421bc
								
							
								
							
						 | 
						
							
							
								
								【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息提交
							
							
							
							
							
						 | 
						
							2022-01-14 15:44:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								053de388f2
								
							
								
							
						 | 
						
							
							
								
								神将修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 14:52:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								771c445488
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0优化/玩家信息界面拓展
							
							
							
							
							
						 | 
						
							2022-01-14 14:16:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7556405e8b
								
							
								
							
						 | 
						
							
							
								
								切图修改
							
							
							
							
							
						 | 
						
							2022-01-14 13:45:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5252dbe400
								
							
								
							
						 | 
						
							
							
								
								技能添加底图
							
							
							
							
							
						 | 
						
							2022-01-14 13:20:32 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								981aba2417
								
							
								
							
						 | 
						
							
							
								
								神将情报修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 11:26:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8377e33b31
								
							
								
							
						 | 
						
							
							
								
								神将情报修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 10:50:51 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e4ea506ed1
								
							
								
							
						 | 
						
							
							
								
								神将情报修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 10:17:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5b36346da3
								
							
								
							
						 | 
						
							
							
								
								【玩家信息】提交
							
							
							
							
							
						 | 
						
							2022-01-13 18:29:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								70d753cce5
								
							
								
							
						 | 
						
							
							
								
								极速探索按钮颜色调整
							
							
							
							
							
						 | 
						
							2022-01-13 16:41:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f043b3e62f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0优化/玩家信息界面拓展
							
							
							
							
							
						 | 
						
							2022-01-13 16:04:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								36b475ee15
								
							
								
							
						 | 
						
							
							
								
								【玩家信息】增加额外属性
							
							
							
							
							
						 | 
						
							2022-01-13 15:23:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8351aba49c
								
							
								
							
						 | 
						
							
							
								
								【战斗】我方buff显示位置修改
							
							
							
							
							
						 | 
						
							2022-01-13 13:56:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4ffae70799
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-13 11:39:15 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1c5736bbad
								
							
								
							
						 | 
						
							
							
								
								【动画】部分界面动画优化
							
							
							
							
							
						 | 
						
							2022-01-13 11:39:02 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a16b592892
								
							
								
							
						 | 
						
							
							
								
								[飞升]=========飞升优化修改
							
							
							
							
							
						 | 
						
							2022-01-13 10:01:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								48901f3817
								
							
								
							
						 | 
						
							
							
								
								【寻仙招募】心愿单中添加飞升石道具
							
							
							
							
							
						 | 
						
							2022-01-12 18:27:16 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ff7b7ba5ed
								
							
								
							
						 | 
						
							
							
								
								[飞升]=====bug修改提交
							
							
							
							
							
						 | 
						
							2022-01-12 16:41:51 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1e1e697ba4
								
							
								
							
						 | 
						
							
							
								
								预设漏提
							
							
							
							
							
						 | 
						
							2022-01-12 14:40:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								373ae35652
								
							
								
							
						 | 
						
							
							
								
								【家园】详情位置修改
							
							
							
							
							
						 | 
						
							2022-01-12 14:28:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d0fb035a19
								
							
								
							
						 | 
						
							
							
								
								【家园】提交弹框背景
							
							
							
							
							
						 | 
						
							2022-01-11 18:23:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9826244e7e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-11 18:19:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8d82a962a6
								
							
								
							
						 | 
						
							
							
								
								【家园】特效提交
							
							
							
							
							
						 | 
						
							2022-01-11 18:18:41 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								039f9a3deb
								
							
								
							
						 | 
						
							
							
								
								[图鉴]======图鉴修改提交
							
							
							
							
							
						 | 
						
							2022-01-11 18:11:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a01485ebab
								
							
								
							
						 | 
						
							
							
								
								资源提交
							
							
							
							
							
						 | 
						
							2022-01-11 15:36:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								36c6228096
								
							
								
							
						 | 
						
							
							
								
								图片修改提交
							
							
							
							
							
						 | 
						
							2022-01-11 14:56:37 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e74d94e59e
								
							
								
							
						 | 
						
							
							
								
								神将情报界面修改提交
							
							
							
							
							
						 | 
						
							2022-01-11 14:40:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0ee930c550
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-14 14:01:01 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5d2838554d
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动/新大圣升星' into china/dev
							
							
							
							
							
						 | 
						
							2022-01-14 14:00:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9fbc2df41f
								
							
								
							
						 | 
						
							
							
								
								【限时升星】界面显示优化
							
							
							
							
							
						 | 
						
							2022-01-14 12:03:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8ae14c38fa
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-11 13:49:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								12cdbed48c
								
							
								
							
						 | 
						
							
							
								
								【ID1011029】
							
							
							
							
							
							
							
							【优化】 神将界面优化 
							
						 | 
						
							2022-01-11 13:48:54 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d0bdfb935c
								
							
								
							
						 | 
						
							
							
								
								【家园】特权增加文字提示条目
							
							
							
							
							
						 | 
						
							2022-01-11 13:25:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8e7a0eb4fa
								
							
								
							
						 | 
						
							
							
								
								适配修改提交
							
							
							
							
							
						 | 
						
							2022-01-11 12:02:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ec6e504546
								
							
								
							
						 | 
						
							
							
								
								【ID1011029】
							
							
							
							
							
							
							
							【优化】 神将界面优化 
							
						 | 
						
							2022-01-11 11:18:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								40e37473dc
								
							
								
							
						 | 
						
							
							
								
								【ID1011029】
							
							
							
							
							
							
							
							【优化】 神将界面优化 
							
						 | 
						
							2022-01-11 11:09:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c795995bf6
								
							
								
							
						 | 
						
							
							
								
								【心魔试炼】奖励按钮显示错误
							
							
							
							
							
						 | 
						
							2022-01-10 14:33:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ee60ae6c9a
								
							
								
							
						 | 
						
							
							
								
								【限时升星】显示优化,红点添加,条件屏蔽添加
							
							
							
							
							
						 | 
						
							2022-01-10 11:44:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								dfb04baf75
								
							
								
							
						 | 
						
							
							
								
								【限时升星】添加可选择的升星有礼活动
							
							
							
							
							
						 | 
						
							2022-01-08 18:40:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0a4c24520c
								
							
								
							
						 | 
						
							
							
								
								【编队筛选】红叉资源替换
							
							
							
							
							
						 | 
						
							2022-01-08 15:03:06 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a4bd6fb441
								
							
								
							
						 | 
						
							
							
								
								【日常】修复动画导致成就显示异常
							
							
							
							
							
						 | 
						
							2022-01-08 14:23:44 +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
							
						 | 
						
							
							
							
							
								
							
								334ba9bd19
								
							
								
							
						 | 
						
							
							
								
								【建木神树优化】界面中可预览当前神应属性和下级增加属性
							
							
							
							
							
						 | 
						
							2022-01-07 19:34:07 +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 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								eea23a9dda
								
							
								
							
						 | 
						
							
							
								
								不显示收益修改提交
							
							
							
							
							
						 | 
						
							2022-01-07 13:58:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e16c47a8de
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-07 11:28:58 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e5c176cd9f
								
							
								
							
						 | 
						
							
							
								
								[飞升]============特效显示修改提交
							
							
							
							
							
						 | 
						
							2022-01-07 10:08:55 +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
							
						 | 
						
							
							
							
							
								
							
								59bdf19b9e
								
							
								
							
						 | 
						
							
							
								
								主城预设提交
							
							
							
							
							
						 | 
						
							2022-01-06 18:34:48 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6b1c28a920
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/家园
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua 
							
						 | 
						
							2022-01-06 16:40:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e484b2bac8
								
							
								
							
						 | 
						
							
							
								
								星力聚灵资源提交
							
							
							
							
							
						 | 
						
							2022-01-06 16:15:49 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								757c436878
								
							
								
							
						 | 
						
							
							
								
								编队预设提交
							
							
							
							
							
						 | 
						
							2022-01-06 16:12:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b1be355601
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'tansuo' into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Atlas/ExploreAtlas.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua 
							
						 | 
						
							2022-01-06 16:07:59 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9c874f1789
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/家园
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
#	Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua 
							
						 | 
						
							2022-01-06 15:38:48 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4133605f55
								
							
								
							
						 | 
						
							
							
								
								【家园】引导提交
							
							
							
							
							
						 | 
						
							2022-01-06 15:28:41 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f3349ca4d1
								
							
								
							
						 | 
						
							
							
								
								【ID1010966】
							
							
							
							
							
							
							
							【优化】法宝聚灵调整 
							
						 | 
						
							2022-01-06 15:18:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								79364232f0
								
							
								
							
						 | 
						
							
							
								
								【ID1010966】
							
							
							
							
							
							
							
							【优化】法宝聚灵调整 
							
						 | 
						
							2022-01-06 14:52:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7058575f3a
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-06 14:23:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								68ad9cf7e1
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-06 11:45:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								893e33d920
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-06 10:33:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2b588340aa
								
							
								
							
						 | 
						
							
							
								
								【ID1019476】
							
							
							
							
							
							
							
							【探索】称号遮挡复活中 
							
						 | 
						
							2022-01-06 09:49:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								27a96fa139
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-05 18:18:06 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5b670023ed
								
							
								
							
						 | 
						
							
							
								
								[飞升]=======飞升代码逻辑提交
							
							
							
							
							
						 | 
						
							2022-01-05 18:17:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2a8b4bca8c
								
							
								
							
						 | 
						
							
							
								
								【ID1010994】
							
							
							
							
							
							
							
							增加单笔充值活动 
							
						 | 
						
							2022-01-05 18:17:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								aa761fc4e9
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 18:04:57 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								662ad26223
								
							
								
							
						 | 
						
							
							
								
								【优化】心魔/四灵试炼增加编队按钮
							
							
							
							
							
						 | 
						
							2022-01-05 17:25:39 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b45f74781c
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 17:06:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6f4942e87e
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 16:21:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6ca1e17d52
								
							
								
							
						 | 
						
							
							
								
								【ID1010994】
							
							
							
							
							
							
							
							增加单笔充值活动 
							
						 | 
						
							2022-01-05 15:38:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f0de43aad2
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 14:17:53 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c0d27feac2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/家园
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua 
							
						 | 
						
							2022-01-05 10:16:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5e0c53e322
								
							
								
							
						 | 
						
							
							
								
								【家园】替换底图
							
							
							
							
							
						 | 
						
							2022-01-04 18:58:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7bfa7057ac
								
							
								
							
						 | 
						
							
							
								
								位置修改提交
							
							
							
							
							
						 | 
						
							2022-01-04 16:51:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7eade17002
								
							
								
							
						 | 
						
							
							
								
								提示位置修改提交
							
							
							
							
							
						 | 
						
							2022-01-04 16:47:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								99014979b1
								
							
								
							
						 | 
						
							
							
								
								添加提示
							
							
							
							
							
						 | 
						
							2022-01-04 16:43:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fb8de57afa
								
							
								
							
						 | 
						
							
							
								
								累计收益提交
							
							
							
							
							
						 | 
						
							2022-01-04 16:30:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e079eff322
								
							
								
							
						 | 
						
							
							
								
								适配修改提交
							
							
							
							
							
						 | 
						
							2022-01-04 15:42:06 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a07fdc40ac
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-04 15:10:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ebc67f1602
								
							
								
							
						 | 
						
							
							
								
								战力修改提交
							
							
							
							
							
						 | 
						
							2022-01-04 14:21:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ad8653d679
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0优化/山河社稷图筛选显示' into china/dev
							
							
							
							
							
						 | 
						
							2022-01-04 13:22:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								fbe50eb413
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-04 10:51:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								108252b8e4
								
							
								
							
						 | 
						
							
							
								
								【排行】修复显示异常
							
							
							
							
							
						 | 
						
							2022-01-04 10:20:37 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9b2057bede
								
							
								
							
						 | 
						
							
							
								
								【山河筛选】添加职业呼吸效果
							
							
							
							
							
						 | 
						
							2022-01-03 02:17:03 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								39244f8ce5
								
							
								
							
						 | 
						
							
							
								
								【家园】特权完成,2021最后的提交!!
							
							
							
							
							
						 | 
						
							2021-12-31 18:58:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2b3afae7ea
								
							
								
							
						 | 
						
							
							
								
								【家园】特权
							
							
							
							
							
						 | 
						
							2021-12-31 18:13:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d1b84299c2
								
							
								
							
						 | 
						
							
							
								
								【修行优化】点击圆点弹出TIPS后,切换点击其他圆点应切换TIPS内容,而非关闭之前的TIPS
							
							
							
							
							
						 | 
						
							2022-01-03 02:43:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								27ead6dcff
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-31 16:30:53 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								2f2634eb39
								
							
								
							
						 | 
						
							
							
								
								【飞升】=====代码预设提交
							
							
							
							
							
						 | 
						
							2021-12-31 13:50:49 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cf9cbc5ac9
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁装备属性加持+战斗力
							
							
							
							
							
						 | 
						
							2021-12-31 13:44:11 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b696084384
								
							
								
							
						 | 
						
							
							
								
								飞升预设修改提交
							
							
							
							
							
						 | 
						
							2021-12-31 11:15:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								90d1971b25
								
							
								
							
						 | 
						
							
							
								
								累计收益修改提交
							
							
							
							
							
						 | 
						
							2021-12-31 11:06:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6952b54a6c
								
							
								
							
						 | 
						
							
							
								
								累计收益修改提交
							
							
							
							
							
						 | 
						
							2021-12-31 10:48:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bd2d5ccd50
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-30 20:24:59 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								85319e89f0
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-30 20:09:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8de1e4e596
								
							
								
							
						 | 
						
							
							
								
								【家园】资源提交
							
							
							
							
							
						 | 
						
							2021-12-30 19:02:52 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								57b0689de6
								
							
								
							
						 | 
						
							
							
								
								【ID1010911】
							
							
							
							
							
							
							
							【森罗优化】退出森罗幻境时弹出累积收益 
							
						 | 
						
							2021-12-30 18:06:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5ab9c8d915
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into tansuo
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua 
							
						 | 
						
							2021-12-30 16:47:19 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								72400429f3
								
							
								
							
						 | 
						
							
							
								
								【邮件】有附件时添加分割线
							
							
							
							
							
						 | 
						
							2022-01-02 02:49:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4c0a3a3864
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2022-01-02 02:48:25 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f4e149e898
								
							
								
							
						 | 
						
							
							
								
								【邮件】有附件时添加分割线
							
							
							
							
							
						 | 
						
							2022-01-02 02:48:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d4d1653bc2
								
							
								
							
						 | 
						
							
							
								
								探索优化
							
							
							
							
							
						 | 
						
							2021-12-30 14:01:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								80263f61f0
								
							
								
							
						 | 
						
							
							
								
								探索优化提交
							
							
							
							
							
						 | 
						
							2021-12-30 13:50:39 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a5bdf99a26
								
							
								
							
						 | 
						
							
							
								
								[玉虚论道]=====他人队伍信息灵兽星级位置修改
							
							
							
							
							
						 | 
						
							2021-12-30 13:35:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0f32a05956
								
							
								
							
						 | 
						
							
							
								
								【装备界面】增加摘星阁加持
							
							
							
							
							
						 | 
						
							2021-12-30 11:49:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7b67ef38df
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into tansuo
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua 
							
						 | 
						
							2021-12-30 11:43:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2a14bc799f
								
							
								
							
						 | 
						
							
							
								
								探索中优化
							
							
							
							
							
						 | 
						
							2021-12-30 11:41:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								44aa663ab0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/家园
							
							
							
							
							
						 | 
						
							2021-12-30 11:24:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f148668636
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-30 11:00:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								630d56c810
								
							
								
							
						 | 
						
							
							
								
								【家园】装备强化升级
							
							
							
							
							
						 | 
						
							2021-12-29 20:17:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2e8d75023d
								
							
								
							
						 | 
						
							
							
								
								添加动画
							
							
							
							
							
						 | 
						
							2021-12-29 18:39:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4318b37891
								
							
								
							
						 | 
						
							
							
								
								探索中修改提交
							
							
							
							
							
						 | 
						
							2021-12-29 14:53:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								73eebe80e0
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-29 14:33:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								32cc5de541
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-29 14:30:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4e4ebd563c
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-29 14:24:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a1301a4a22
								
							
								
							
						 | 
						
							
							
								
								【家园】任务
							
							
							
							
							
						 | 
						
							2021-12-29 14:03:16 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d659eeba39
								
							
								
							
						 | 
						
							
							
								
								【动画】排行,邮件界面动画优化,部分简介界面动画关闭
							
							
							
							
							
						 | 
						
							2021-12-31 04:32:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								26dc765925
								
							
								
							
						 | 
						
							
							
								
								【动画】物品信息动画修改
							
							
							
							
							
						 | 
						
							2021-12-31 00:36:36 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0697e8646f
								
							
								
							
						 | 
						
							
							
								
								【动画】主城添加动画
							
							
							
							
							
						 | 
						
							2021-12-31 00:18:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								52abb411a2
								
							
								
							
						 | 
						
							
							
								
								【动画】主城添加动画
							
							
							
							
							
						 | 
						
							2021-12-31 00:14:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e5b2eb212b
								
							
								
							
						 | 
						
							
							
								
								【动画】日常任务动画优化
							
							
							
							
							
						 | 
						
							2021-12-30 22:08:45 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e90f96705d
								
							
								
							
						 | 
						
							
							
								
								【动画】通用弹窗动画优化
							
							
							
							
							
						 | 
						
							2021-12-30 22:08:29 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5757b82777
								
							
								
							
						 | 
						
							
							
								
								【动画】三级弹窗,帮助界面动画优化
							
							
							
							
							
						 | 
						
							2021-12-30 22:08:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5c51490cf5
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-29 10:33:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								dac88a6dbf
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-29 10:02:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								197b28b3da
								
							
								
							
						 | 
						
							
							
								
								【家园】加速确认
							
							
							
							
							
						 | 
						
							2021-12-28 18:27:31 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d06a5e6471
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-28 18:16:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								978689d9a7
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-28 17:52:28 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								73d92664de
								
							
								
							
						 | 
						
							
							
								
								[飞升]=======飞升逻辑提交
							
							
							
							
							
						 | 
						
							2021-12-28 16:20:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5e75e2384e
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-28 15:31:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b40bd10a32
								
							
								
							
						 | 
						
							
							
								
								主城修改提交
							
							
							
							
							
						 | 
						
							2021-12-28 15:07:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b256c7a9c5
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-28 14:50:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								69cb591edb
								
							
								
							
						 | 
						
							
							
								
								【家园】升级进度条
							
							
							
							
							
						 | 
						
							2021-12-28 13:37:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9dafa85858
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-28 13:30:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b66cfdc61d
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-28 11:54:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								738333f924
								
							
								
							
						 | 
						
							
							
								
								预设冲突提交
							
							
							
							
							
						 | 
						
							2021-12-27 17:04:54 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d83373ecab
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into tansuo
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
#	Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpViewNew.lua
#	Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua 
							
						 | 
						
							2021-12-27 17:00:14 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								380b0bdb78
								
							
								
							
						 | 
						
							
							
								
								[飞升]=============飞升代码提交
							
							
							
							
							
						 | 
						
							2021-12-27 16:39:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9e47928008
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-27 16:16:56 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d7749de932
								
							
								
							
						 | 
						
							
							
								
								【资源】======女儿国王 申公豹spine修改
							
							
							
							
							
						 | 
						
							2021-12-27 15:45:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								dfb2fa6faf
								
							
								
							
						 | 
						
							
							
								
								预设提交
							
							
							
							
							
						 | 
						
							2021-12-27 15:45:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b9a86b402c
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-27 14:53:55 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								337261f8b2
								
							
								
							
						 | 
						
							
							
								
								【家园】升级,取消,加速
							
							
							
							
							
						 | 
						
							2021-12-24 18:20:18 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ca17383879
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/dev_res
							
							
							
							
							
						 | 
						
							2021-12-24 14:55:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								88130ac4dd
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-24 14:09:48 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d10d2f976a
								
							
								
							
						 | 
						
							
							
								
								【装备合成】添加输入改变合成数量的功能
							
							
							
							
							
						 | 
						
							2021-12-30 22:19:09 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7f0e684bc0
								
							
								
							
						 | 
						
							
							
								
								一键探索修改提交
							
							
							
							
							
						 | 
						
							2021-12-24 11:18:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e34092f93d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-24 10:54:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6dfafd7054
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-24 00:33:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								130a75c8dd
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-24 00:14:32 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								078c3a1f96
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/家园
							
							
							
							
							
						 | 
						
							2021-12-23 17:48:20 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								606bedd85c
								
							
								
							
						 | 
						
							
							
								
								【挂机】新人商城按钮效果修改
							
							
							
							
							
						 | 
						
							2021-12-23 17:43:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5d37c0d4d9
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-23 17:23:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								926e0a4fbd
								
							
								
							
						 | 
						
							
							
								
								【命石】一键合成修改
							
							
							
							
							
						 | 
						
							2021-12-23 16:17:35 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								da2b205955
								
							
								
							
						 | 
						
							
							
								
								【挂机】添加新人商城入口
							
							
							
							
							
						 | 
						
							2021-12-30 00:01:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c920c8d064
								
							
								
							
						 | 
						
							
							
								
								【家园】预设冲突提交
							
							
							
							
							
						 | 
						
							2021-12-23 14:53:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6fe4e5d3f6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/家园
							
							
							
							
							
						 | 
						
							2021-12-23 14:49:47 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f676ae8478
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-23 14:38:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								83b5a04ac6
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-23 13:45:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								39254af42e
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-23 13:45:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7bb3325c99
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-23 13:09:34 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								d62532c90c
								
							
								
							
						 | 
						
							
							
								
								【坐骑】资源名冲突修改
							
							
							
							
							
						 | 
						
							2021-12-23 11:46:13 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								cf87db6577
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/dev_res
							
							
							
							
							
						 | 
						
							2021-12-23 11:05:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e6d1ac6ef0
								
							
								
							
						 | 
						
							
							
								
								【修行】冲突修改
							
							
							
							
							
						 | 
						
							2021-12-23 09:53:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e6aa1d31fe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua 
							
						 | 
						
							2021-12-23 09:43:06 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b7bfc1d867
								
							
								
							
						 | 
						
							
							
								
								【资源】======虎年坐骑提交
							
							
							
							
							
						 | 
						
							2021-12-22 16:15:51 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d2271d89b6
								
							
								
							
						 | 
						
							
							
								
								探索提交
							
							
							
							
							
						 | 
						
							2021-12-22 12:07:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e111740975
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/家园
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2021-12-21 18:13:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								85795f19cc
								
							
								
							
						 | 
						
							
							
								
								适配修改提交
							
							
							
							
							
						 | 
						
							2021-12-21 18:12:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d2efbd920c
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2021-12-21 18:11:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								99ca3a60eb
								
							
								
							
						 | 
						
							
							
								
								适配修改提交
							
							
							
							
							
						 | 
						
							2021-12-21 18:10:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								edbf25dc59
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-21 17:21:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								89fdc69afd
								
							
								
							
						 | 
						
							
							
								
								添加拍脸提交
							
							
							
							
							
						 | 
						
							2021-12-21 17:21:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b9bb2cf544
								
							
								
							
						 | 
						
							
							
								
								【修行】星数到达四位后只显示三位
							
							
							
							
							
						 | 
						
							2021-12-21 13:23:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8eb6abec8e
								
							
								
							
						 | 
						
							
							
								
								【家园】开坑
							
							
							
							
							
						 | 
						
							2021-12-20 16:50:51 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								885a6e2fa8
								
							
								
							
						 | 
						
							
							
								
								[功能]========结算记录界面添加阵亡标签
							
							
							
							
							
						 | 
						
							2021-12-20 15:32:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								cddbe10d1a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-20 14:15:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d1fd74db04
								
							
								
							
						 | 
						
							
							
								
								【ID1019430】
							
							
							
							
							
							
							
							【神将回退】光效穿透 
							
						 | 
						
							2021-12-20 14:15:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								745a9d1dae
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset 
							
						 | 
						
							2021-12-20 14:07:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6d93ab7dca
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-20 14:05:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8b7b5c8fa9
								
							
								
							
						 | 
						
							
							
								
								【连购礼包】无礼包修改
							
							
							
							
							
						 | 
						
							2021-12-20 14:05:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7002f1ac42
								
							
								
							
						 | 
						
							
							
								
								关卡提示修改
							
							
							
							
							
						 | 
						
							2021-12-20 13:10:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								834cdf87da
								
							
								
							
						 | 
						
							
							
								
								【新将来袭】取消珍奇宝阁
							
							
							
							
							
						 | 
						
							2021-12-17 18:59:54 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0377b2b642
								
							
								
							
						 | 
						
							
							
								
								【特惠商城】提交
							
							
							
							
							
						 | 
						
							2021-12-17 18:53:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								38966d1b16
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-17 18:35:40 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								72b0f31d50
								
							
								
							
						 | 
						
							
							
								
								【特惠商城】提交
							
							
							
							
							
						 | 
						
							2021-12-17 18:25:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f441e7a7ea
								
							
								
							
						 | 
						
							
							
								
								适配修改提交
							
							
							
							
							
						 | 
						
							2021-12-17 18:13:14 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6573b10a59
								
							
								
							
						 | 
						
							
							
								
								资源提交
							
							
							
							
							
						 | 
						
							2021-12-17 17:42:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5c042b2c60
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-17 17:19:58 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								893cd69527
								
							
								
							
						 | 
						
							
							
								
								特效被切修改提交
							
							
							
							
							
						 | 
						
							2021-12-17 17:19:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								df483145bf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-17 17:13:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a9b7c21fad
								
							
								
							
						 | 
						
							
							
								
								【道具弹窗】跳转按钮错位
							
							
							
							
							
						 | 
						
							2021-12-17 17:13:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7e444d54c6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-17 16:55:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ce0c1db2f3
								
							
								
							
						 | 
						
							
							
								
								【关卡】解锁提示资源提交
							
							
							
							
							
						 | 
						
							2021-12-27 16:55:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a16931b9dc
								
							
								
							
						 | 
						
							
							
								
								文字位置修改提交
							
							
							
							
							
						 | 
						
							2021-12-17 16:55:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ffd7d0ecbe
								
							
								
							
						 | 
						
							
							
								
								超值返利修改提交
							
							
							
							
							
						 | 
						
							2021-12-17 16:41:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								80d4df7add
								
							
								
							
						 | 
						
							
							
								
								【命格】冲突提交
							
							
							
							
							
						 | 
						
							2021-12-17 15:49:55 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a197f16837
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua 
							
						 | 
						
							2021-12-17 15:46:53 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9c07c341e5
								
							
								
							
						 | 
						
							
							
								
								【资源】===嫦娥新动作提交
							
							
							
							
							
						 | 
						
							2021-12-17 15:08:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d5ae25820d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-17 14:00:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d939e6b32b
								
							
								
							
						 | 
						
							
							
								
								【新人商城】提交
							
							
							
							
							
						 | 
						
							2021-12-17 14:00:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2f489fecad
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-17 13:29:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								717e5f3411
								
							
								
							
						 | 
						
							
							
								
								【关卡】解锁提示按钮组件添加
							
							
							
							
							
						 | 
						
							2021-12-27 13:20:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4fdd4e7b62
								
							
								
							
						 | 
						
							
							
								
								跳转修改提交
							
							
							
							
							
						 | 
						
							2021-12-17 13:29:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ab3d7e939b
								
							
								
							
						 | 
						
							
							
								
								【解锁提示】添加功能解锁提示
							
							
							
							
							
						 | 
						
							2021-12-26 19:12:25 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								740aeac6bf
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-16 18:43:36 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								eaea265bc7
								
							
								
							
						 | 
						
							
							
								
								【物品】添加物品使用的限制等级
							
							
							
							
							
						 | 
						
							2021-12-26 17:35:50 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								19a1e1b7ca
								
							
								
							
						 | 
						
							
							
								
								超值返利提交
							
							
							
							
							
						 | 
						
							2021-12-16 18:41:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c1f0e0f78b
								
							
								
							
						 | 
						
							
							
								
								添加选中框
							
							
							
							
							
						 | 
						
							2021-12-16 18:38:32 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b203711459
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0优化/商城界面
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset 
							
						 | 
						
							2021-12-16 17:17:16 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								cb8f8fe0aa
								
							
								
							
						 | 
						
							
							
								
								【挂机物品】添加时间标签
							
							
							
							
							
						 | 
						
							2021-12-26 17:13:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								50927b9ac5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-16 16:55:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1ae167efb5
								
							
								
							
						 | 
						
							
							
								
								至尊降世修改提交
							
							
							
							
							
						 | 
						
							2021-12-16 16:55:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ae3f0c5df2
								
							
								
							
						 | 
						
							
							
								
								【连续礼包】新增连续礼包入口
							
							
							
							
							
						 | 
						
							2021-12-16 14:20:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b811bd0d24
								
							
								
							
						 | 
						
							
							
								
								超值返利预设代码提交
							
							
							
							
							
						 | 
						
							2021-12-16 11:45:51 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								33f0b51d94
								
							
								
							
						 | 
						
							
							
								
								超值返利预设代码提交
							
							
							
							
							
						 | 
						
							2021-12-16 11:45:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								11c4f914b5
								
							
								
							
						 | 
						
							
							
								
								至尊降世提交
							
							
							
							
							
						 | 
						
							2021-12-16 11:42:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2858f2e400
								
							
								
							
						 | 
						
							
							
								
								【商城界面】提交
							
							
							
							
							
						 | 
						
							2021-12-16 10:46:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								73283bd818
								
							
								
							
						 | 
						
							
							
								
								回退修改提交
							
							
							
							
							
						 | 
						
							2021-12-16 10:09:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c6eb719fa6
								
							
								
							
						 | 
						
							
							
								
								添加回退消耗数量
							
							
							
							
							
						 | 
						
							2021-12-15 14:41:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0b190666d5
								
							
								
							
						 | 
						
							
							
								
								【商城界面】提交
							
							
							
							
							
						 | 
						
							2021-12-15 14:34:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								568ad92a9b
								
							
								
							
						 | 
						
							
							
								
								回退修改
							
							
							
							
							
						 | 
						
							2021-12-15 14:28:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0d9a3cb8ed
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-15 10:28:43 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2e2718d5bf
								
							
								
							
						 | 
						
							
							
								
								预设修改提交
							
							
							
							
							
						 | 
						
							2021-12-15 10:28:26 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9f2a977b07
								
							
								
							
						 | 
						
							
							
								
								[功能]=========战斗统计界面添加死亡置灰
							
							
							
							
							
						 | 
						
							2021-12-15 09:44:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b07f3ce2d5
								
							
								
							
						 | 
						
							
							
								
								【商城界面】提交
							
							
							
							
							
						 | 
						
							2021-12-14 19:16:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								56aad6a959
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-14 17:52:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								89a034a85e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-14 17:26:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0c83c3412e
								
							
								
							
						 | 
						
							
							
								
								【ID1010843】
							
							
							
							
							
							
							
							增加英雄回退功能 
							
						 | 
						
							2021-12-14 17:25:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e1a9459101
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-14 16:17:49 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								98308fe892
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
						 | 
						
							2021-12-14 15:32:05 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								31ce94705d
								
							
								
							
						 | 
						
							
							
								
								【商城界面】资源提交
							
							
							
							
							
						 | 
						
							2021-12-14 13:15:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								887e444547
								
							
								
							
						 | 
						
							
							
								
								【新商城】提交
							
							
							
							
							
						 | 
						
							2021-12-14 11:18:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4cb31b3ba0
								
							
								
							
						 | 
						
							
							
								
								【森罗幻境】修复英雄选框底图消失问题
							
							
							
							
							
						 | 
						
							2021-12-14 10:05:49 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f248583e9e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
						 | 
						
							2021-12-14 09:49:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								663957bbce
								
							
								
							
						 | 
						
							
							
								
								去掉帮助按钮,修改文字
							
							
							
							
							
						 | 
						
							2021-12-14 09:35:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								bfd0cd7184
								
							
								
							
						 | 
						
							
							
								
								适配修改提交
							
							
							
							
							
						 | 
						
							2021-12-13 17:27:29 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0b9bd476dd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
						 | 
						
							2021-12-13 17:26:43 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d91811a555
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-13 17:26:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								acca1c0eae
								
							
								
							
						 | 
						
							
							
								
								添加一个按钮
							
							
							
							
							
						 | 
						
							2021-12-13 16:31:41 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2079a4efcb
								
							
								
							
						 | 
						
							
							
								
								适配修改提交
							
							
							
							
							
						 | 
						
							2021-12-13 15:08:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ab5b654b73
								
							
								
							
						 | 
						
							
							
								
								【法宝聚灵】增加特效
							
							
							
							
							
						 | 
						
							2021-12-13 12:14:46 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f444315fee
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
						 | 
						
							2021-12-10 18:32:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c11848b98a
								
							
								
							
						 | 
						
							
							
								
								【命格】红点提交
							
							
							
							
							
						 | 
						
							2021-12-10 18:27:43 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								94c98be0e5
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-10 16:17:47 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d3a2fdf110
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-10 16:07:46 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1ae26afed2
								
							
								
							
						 | 
						
							
							
								
								【命格】跳转
							
							
							
							
							
						 | 
						
							2021-12-10 15:46:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a3c24ee4b7
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-10 15:29:03 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								70f5308d1d
								
							
								
							
						 | 
						
							
							
								
								【命格】宝石资源提交
							
							
							
							
							
						 | 
						
							2021-12-10 15:05:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9069b2ed2c
								
							
								
							
						 | 
						
							
							
								
								招募秘宝提交
							
							
							
							
							
						 | 
						
							2021-12-10 14:58:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9140a632f9
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-10 14:57:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f09556242d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua 
							
						 | 
						
							2021-12-10 14:16:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								982137c9b7
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-10 14:14:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								82c89e5e7d
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-10 13:57:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fe0efcb631
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua 
							
						 | 
						
							2021-12-10 13:42:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e33181dddb
								
							
								
							
						 | 
						
							
							
								
								招募秘宝提交
							
							
							
							
							
						 | 
						
							2021-12-10 13:41:03 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f067ae5080
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-10 11:40:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bab62f274c
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-10 11:01:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cb5cf43089
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-09 20:17:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9875630085
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-09 13:29:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7bcc95f31f
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-08 18:34:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b52b30ab1e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua 
							
						 | 
						
							2021-12-08 17:30:54 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4f1e129473
								
							
								
							
						 | 
						
							
							
								
								【命格】加成预览提交
							
							
							
							
							
						 | 
						
							2021-12-08 17:27:22 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f846d6f17e
								
							
								
							
						 | 
						
							
							
								
								【战斗】加入三倍速
							
							
							
							
							
						 | 
						
							2021-12-08 16:39:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								be16abf79a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2021-12-08 14:18:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								016780c7bc
								
							
								
							
						 | 
						
							
							
								
								【命格】命石替换
							
							
							
							
							
						 | 
						
							2021-12-08 14:17:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1136879d55
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-08 14:03:43 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9b1ca0135c
								
							
								
							
						 | 
						
							
							
								
								【ID1010829】
							
							
							
							
							
							
							
							增加开服竞技比拼活动——竞技试炼 
							
						 | 
						
							2021-12-08 14:03:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1efc9fc56b
								
							
								
							
						 | 
						
							
							
								
								【命格】命石穿戴
							
							
							
							
							
						 | 
						
							2021-12-08 09:29:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2a68523d05
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-07 17:19:07 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a0675baeb8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
						 | 
						
							2021-12-07 16:28:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								eb1a9f29e5
								
							
								
							
						 | 
						
							
							
								
								【命格】测试按钮提交
							
							
							
							
							
						 | 
						
							2021-12-07 15:40:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								86f1620e7d
								
							
								
							
						 | 
						
							
							
								
								【连购好礼】活动时间兼容调整
							
							
							
							
							
						 | 
						
							2021-12-07 15:22:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								00f0e12f28
								
							
								
							
						 | 
						
							
							
								
								【命格】背包中显示
							
							
							
							
							
						 | 
						
							2021-12-07 14:03:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3ad898f8af
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-07 11:50:03 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8efea1f06e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
						 | 
						
							2021-12-07 09:17:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								692425511c
								
							
								
							
						 | 
						
							
							
								
								【寻宝迷踪】增加珍奇宝阁入口
							
							
							
							
							
						 | 
						
							2021-12-06 18:44:33 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3b53332e7b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset 
							
						 | 
						
							2021-12-06 18:26:14 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d9f71e2f48
								
							
								
							
						 | 
						
							
							
								
								大闹天宫添加神魂等级
							
							
							
							
							
						 | 
						
							2021-12-06 17:47:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								78e8865e95
								
							
								
							
						 | 
						
							
							
								
								【连购礼包】提交
							
							
							
							
							
						 | 
						
							2021-12-06 16:59:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								daa1780104
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-06 16:54:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9ae56712c4
								
							
								
							
						 | 
						
							
							
								
								添加已获得标志
							
							
							
							
							
						 | 
						
							2021-12-06 16:04:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bf520c66f2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/命格
							
							
							
							
							
						 | 
						
							2021-12-06 16:02:27 +08:00 | 
						
					
				
					
						
							
							
								 
								luyao
							
						 | 
						
							
							
							
							
								
							
								83044f0586
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/dev_res
							
							
							
							
							
						 | 
						
							2021-12-06 15:43:40 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								022a3ee307
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-06 15:31:29 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								10ad308033
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-06 15:07:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								06d532a9bc
								
							
								
							
						 | 
						
							
							
								
								【命格】开坑
							
							
							
							
							
						 | 
						
							2021-12-06 14:06:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6bf98e7c9f
								
							
								
							
						 | 
						
							
							
								
								【修行】结构修改
							
							
							
							
							
						 | 
						
							2021-12-06 13:02:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2c83c873b9
								
							
								
							
						 | 
						
							
							
								
								时间修改提交
							
							
							
							
							
						 | 
						
							2021-12-06 10:32:31 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7e1cac4cbe
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-06 09:58:25 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6309159f77
								
							
								
							
						 | 
						
							
							
								
								方寸寻宝修改提交
							
							
							
							
							
						 | 
						
							2021-12-06 09:58:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								011c8d7f5d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-03 19:01:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e2ec6d9765
								
							
								
							
						 | 
						
							
							
								
								【连购礼包】奖励靠左
							
							
							
							
							
						 | 
						
							2021-12-03 19:01:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b19801639d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-12-03 18:03:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								660bbdf997
								
							
								
							
						 | 
						
							
							
								
								方寸寻宝修改提交
							
							
							
							
							
						 | 
						
							2021-12-03 18:03:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7348534847
								
							
								
							
						 | 
						
							
							
								
								【去除多余活动信息】
							
							
							
							
							
						 | 
						
							2021-12-03 16:46:40 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8e7afd757d
								
							
								
							
						 | 
						
							
							
								
								【连购礼包】提交
							
							
							
							
							
						 | 
						
							2021-12-03 13:21:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ed5e0f6ab1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0活动开发聚集地/连购礼包
							
							
							
							
							
						 | 
						
							2021-12-03 10:00:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4c7b379ce7
								
							
								
							
						 | 
						
							
							
								
								【灵脉秘境】1号灵脉的灵气数值超框
							
							
							
							
							
						 | 
						
							2021-12-02 19:49:49 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								55f2e6e783
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0活动开发聚集地/连购礼包
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua 
							
						 | 
						
							2021-12-02 17:16:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								aa0e501b4b
								
							
								
							
						 | 
						
							
							
								
								ID1019319】
							
							
							
							
							
							
							
							【神将情报】神将到达330级时情报右侧显示提示应为“最高等级” 
							
						 | 
						
							2021-12-02 16:01:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7b8306f98a
								
							
								
							
						 | 
						
							
							
								
								【ID1010715】
							
							
							
							
							
							
							
							【公会信息优化】公会名称底框右侧添加编辑图标 
							
						 | 
						
							2021-12-02 15:31:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1253466912
								
							
								
							
						 | 
						
							
							
								
								天地烘炉提交
							
							
							
							
							
						 | 
						
							2021-12-02 15:18:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0b5575c6f2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/dev_res
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_lingshou_fanzhuan/Materials/fx_kapianfanmian_daoguangppp.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Materials/blz_400_dagger_end 2.mat.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Model/fuwenlujing_ctrl.controller.meta
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_dao_guocheng.prefab
#	Assets/ManagedResources/EffectResSkill/Effect_c_normal_attack_new/Prefab/c_ren_guocheng.prefab
#	Assets/ManagedResources/Spine/c_0054/c_0054_Atlas.asset.meta
#	Assets/ManagedResources/Spine/c_0054/c_0054_Material.mat.meta
#	Assets/ManagedResources/Spine/c_0054/c_0054_SkeletonData.asset.meta
#	Assets/ManagedResources/Spine/s_fuxi/s_fuxi_Atlas.asset.meta
#	Assets/ManagedResources/Spine/s_fuxi/s_fuxi_SkeletonData.asset.meta 
							
						 | 
						
							2021-12-02 14:39:03 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f431eea90c
								
							
								
							
						 | 
						
							
							
								
								【连购礼包】提交
							
							
							
							
							
						 | 
						
							2021-12-02 14:03:38 +08:00 |