jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								981aba2417
								
							
								
							
						 | 
						
							
							
								
								神将情报修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 11:26:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8377e33b31
								
							
								
							
						 | 
						
							
							
								
								神将情报修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 10:50:51 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								17db5f29c4
								
							
								
							
						 | 
						
							
							
								
								框修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 10:25:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e4ea506ed1
								
							
								
							
						 | 
						
							
							
								
								神将情报修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 10:17:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0b4cfe3a74
								
							
								
							
						 | 
						
							
							
								
								点击技能切换修改
							
							
							
							
							
						 | 
						
							2022-01-12 14:35:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								93fda69ff5
								
							
								
							
						 | 
						
							
							
								
								升级突破状态显示错误修改
							
							
							
							
							
						 | 
						
							2022-01-12 13:37:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f943824ae9
								
							
								
							
						 | 
						
							
							
								
								共鸣中修改提交
							
							
							
							
							
						 | 
						
							2022-01-11 15:40:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a01485ebab
								
							
								
							
						 | 
						
							
							
								
								资源提交
							
							
							
							
							
						 | 
						
							2022-01-11 15:36:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e12e783590
								
							
								
							
						 | 
						
							
							
								
								共鸣中修改提交
							
							
							
							
							
						 | 
						
							2022-01-11 15:31:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								36c6228096
								
							
								
							
						 | 
						
							
							
								
								图片修改提交
							
							
							
							
							
						 | 
						
							2022-01-11 14:56:37 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4d58e36be4
								
							
								
							
						 | 
						
							
							
								
								神将界面技能报错修改
							
							
							
							
							
						 | 
						
							2022-01-11 14:44:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								af9306d8cf
								
							
								
							
						 | 
						
							
							
								
								未解锁添加未解锁提示
							
							
							
							
							
						 | 
						
							2022-01-11 14:23:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b0e7ce6238
								
							
								
							
						 | 
						
							
							
								
								代码漏提
							
							
							
							
							
						 | 
						
							2022-01-11 13:49:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								40e37473dc
								
							
								
							
						 | 
						
							
							
								
								【ID1011029】
							
							
							
							
							
							
							
							【优化】 神将界面优化 
							
						 | 
						
							2022-01-11 11:09:44 +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 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c8b604bde4
								
							
								
							
						 | 
						
							
							
								
								【ID1011007】
							
							
							
							
							
							
							
							【优化】功能开启增加新条件类型 
							
						 | 
						
							2022-01-06 11:30:35 +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 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0c9b3b4f96
								
							
								
							
						 | 
						
							
							
								
								【角色信息】修复回收立绘错误
							
							
							
							
							
						 | 
						
							2021-12-31 17:55:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cf9cbc5ac9
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁装备属性加持+战斗力
							
							
							
							
							
						 | 
						
							2021-12-31 13:44:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								17394f79a0
								
							
								
							
						 | 
						
							
							
								
								【动画】神将切换动画优化
							
							
							
							
							
						 | 
						
							2021-12-31 01:45:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c5448299c0
								
							
								
							
						 | 
						
							
							
								
								报错修改提交
							
							
							
							
							
						 | 
						
							2021-12-15 13:35:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0c83c3412e
								
							
								
							
						 | 
						
							
							
								
								【ID1010843】
							
							
							
							
							
							
							
							增加英雄回退功能 
							
						 | 
						
							2021-12-14 17:25:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3bc06e9b8e
								
							
								
							
						 | 
						
							
							
								
								【白金装备】装备穿戴界面,四星白金装备比五星白金装备排序靠前,其他部位没问题
							
							
							
							
							
						 | 
						
							2021-12-13 10:14:54 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								35e42ed5f0
								
							
								
							
						 | 
						
							
							
								
								【战斗】===buff图标资源 回合变化延时修改
							
							
							
							
							
						 | 
						
							2021-12-07 13:18:52 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								898f3a9b99
								
							
								
							
						 | 
						
							
							
								
								[立绘朝向]=======英雄列表初始化立绘朝向修改
							
							
							
							
							
						 | 
						
							2021-11-30 22:53:49 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								6b742c0788
								
							
								
							
						 | 
						
							
							
								
								[立绘朝向]======皮肤立绘朝向修改
							
							
							
							
							
						 | 
						
							2021-11-30 20:43:56 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								bdb02e9fa4
								
							
								
							
						 | 
						
							
							
								
								[战斗]=====皮肤立绘朝向修改
							
							
							
							
							
						 | 
						
							2021-11-30 11:04:25 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								1eb6115bc9
								
							
								
							
						 | 
						
							
							
								
								[角色朝向]=======立绘朝向修改
							
							
							
							
							
						 | 
						
							2021-11-29 13:21:23 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								dd248f37f6
								
							
								
							
						 | 
						
							
							
								
								[角色朝向]======进阶展示,皮肤显示,好感度
							
							
							
							
							
						 | 
						
							2021-11-27 17:18:04 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3c22a1ef6c
								
							
								
							
						 | 
						
							
							
								
								[立绘朝向]======静态立绘朝向改回原样
							
							
							
							
							
						 | 
						
							2021-11-27 13:17:36 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								c80968098c
								
							
								
							
						 | 
						
							
							
								
								【立绘朝向】=============装备界面立绘朝向
							
							
							
							
							
						 | 
						
							2021-11-27 13:01:27 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								69e30d908c
								
							
								
							
						 | 
						
							
							
								
								[立绘朝向]===============我方立绘展示朝向修改
							
							
							
							
							
						 | 
						
							2021-11-26 16:55:13 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ecedea90f8
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/新增克制属性' into china/dev
							
							
							
							
							
						 | 
						
							2021-11-18 10:49:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								12fe3eb3e4
								
							
								
							
						 | 
						
							
							
								
								【战斗力】公式参数走表,装备,法宝战斗力计算公式修改
							
							
							
							
							
						 | 
						
							2021-11-17 15:55:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b6ce191bff
								
							
								
							
						 | 
						
							
							
								
								【装备界面】无法卸下调整
							
							
							
							
							
						 | 
						
							2021-11-17 12:34:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								cd5c2f585a
								
							
								
							
						 | 
						
							
							
								
								【ID1019160】
							
							
							
							
							
							
							
							【神将】初始4星情报界面有魂印图标,点击提示6星解锁
(cherry picked from commit ee46920fe5) 
							
						 | 
						
							2021-11-16 17:17:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2c0032b829
								
							
								
							
						 | 
						
							
							
								
								【神魂】头像框错误修改
							
							
							
							
							
						 | 
						
							2021-11-15 16:58:49 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b7c354befe
								
							
								
							
						 | 
						
							
							
								
								【神魂】神魂头像框修改
							
							
							
							
							
						 | 
						
							2021-11-15 16:44:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6ed696b426
								
							
								
							
						 | 
						
							
							
								
								法宝界面文字大小修改
							
							
							
							
							
						 | 
						
							2021-11-12 09:40:13 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3addb9905b
								
							
								
							
						 | 
						
							
							
								
								【神将觉醒】觉醒成功界面中,不需要显示非核心天赋的变化(非特性天赋),且【特性】文字需要放大
							
							
							
							
							
						 | 
						
							2021-11-11 14:10:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4455242293
								
							
								
							
						 | 
						
							
							
								
								【ID1019110】
							
							
							
							
							
							
							
							【神魂图鉴】图鉴中的神魂弹窗,神将头像不是边框边框 
							
						 | 
						
							2021-11-11 13:41:42 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7efdfd5029
								
							
								
							
						 | 
						
							
							
								
								【新·装备】增加战力对比图标
							
							
							
							
							
						 | 
						
							2021-11-09 18:24:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f18880622e
								
							
								
							
						 | 
						
							
							
								
								【新·魂灵宝】提交
							
							
							
							
							
						 | 
						
							2021-11-09 17:06:47 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								12e46be512
								
							
								
							
						 | 
						
							
							
								
								【装备界面】提交
							
							
							
							
							
						 | 
						
							2021-11-09 10:22:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								265aaca235
								
							
								
							
						 | 
						
							
							
								
								神将界面特效修改提交
							
							
							
							
							
						 | 
						
							2021-11-08 15:18:28 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bbb89af48e
								
							
								
							
						 | 
						
							
							
								
								【英雄突破】白骨精升级到100级点击突破按钮,弹出跳转提示,点击前往进阶界面报错
							
							
							
							
							
						 | 
						
							2021-11-08 14:10:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								67f3ca9f52
								
							
								
							
						 | 
						
							
							
								
								【适配】1080*2550,进阶白骨精法宝,文字描述遮挡
							
							
							
							
							
						 | 
						
							2021-11-08 13:39:29 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a577d80d76
								
							
								
							
						 | 
						
							
							
								
								【神魂】增加特效
							
							
							
							
							
						 | 
						
							2021-11-08 13:02:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1329112387
								
							
								
							
						 | 
						
							
							
								
								神魂未激活图片修改提交
							
							
							
							
							
						 | 
						
							2021-11-08 11:24:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e8433d1026
								
							
								
							
						 | 
						
							
							
								
								玉虚论道记录神魂修改提交,神将界面修改提交
							
							
							
							
							
						 | 
						
							2021-11-08 10:30:12 +08:00 |