jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e4ea506ed1
								
							
								
							
						 | 
						
							
							
								
								神将情报修改提交
							
							
							
							
							
						 | 
						
							2022-01-14 10:17:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								af9306d8cf
								
							
								
							
						 | 
						
							
							
								
								未解锁添加未解锁提示
							
							
							
							
							
						 | 
						
							2022-01-11 14:23:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								40e37473dc
								
							
								
							
						 | 
						
							
							
								
								【ID1011029】
							
							
							
							
							
							
							
							【优化】 神将界面优化 
							
						 | 
						
							2022-01-11 11:09:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c8b604bde4
								
							
								
							
						 | 
						
							
							
								
								【ID1011007】
							
							
							
							
							
							
							
							【优化】功能开启增加新条件类型 
							
						 | 
						
							2022-01-06 11:30:35 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0c9b3b4f96
								
							
								
							
						 | 
						
							
							
								
								【角色信息】修复回收立绘错误
							
							
							
							
							
						 | 
						
							2021-12-31 17:55:01 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								17394f79a0
								
							
								
							
						 | 
						
							
							
								
								【动画】神将切换动画优化
							
							
							
							
							
						 | 
						
							2021-12-31 01:45:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0c83c3412e
								
							
								
							
						 | 
						
							
							
								
								【ID1010843】
							
							
							
							
							
							
							
							增加英雄回退功能 
							
						 | 
						
							2021-12-14 17:25:44 +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
							
						 | 
						
							
							
							
							
								
							
								69e30d908c
								
							
								
							
						 | 
						
							
							
								
								[立绘朝向]===============我方立绘展示朝向修改
							
							
							
							
							
						 | 
						
							2021-11-26 16:55:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ee46920fe5
								
							
								
							
						 | 
						
							
							
								
								【ID1019160】
							
							
							
							
							
							
							
							【神将】初始4星情报界面有魂印图标,点击提示6星解锁 
							
						 | 
						
							2021-11-16 17:17:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								265aaca235
								
							
								
							
						 | 
						
							
							
								
								神将界面特效修改提交
							
							
							
							
							
						 | 
						
							2021-11-08 15:18:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6f0d51ddb2
								
							
								
							
						 | 
						
							
							
								
								神魂提交
							
							
							
							
							
						 | 
						
							2021-11-03 18:11:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								125e37fe6d
								
							
								
							
						 | 
						
							
							
								
								神魂提交
							
							
							
							
							
						 | 
						
							2021-11-03 10:13:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								681f8d5a57
								
							
								
							
						 | 
						
							
							
								
								神魂提交
							
							
							
							
							
						 | 
						
							2021-11-01 19:11:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9f59cb3b64
								
							
								
							
						 | 
						
							
							
								
								神魂提交
							
							
							
							
							
						 | 
						
							2021-10-27 17:04:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d398c21668
								
							
								
							
						 | 
						
							
							
								
								神魂提交
							
							
							
							
							
						 | 
						
							2021-10-27 12:50:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5e8ad7dd08
								
							
								
							
						 | 
						
							
							
								
								神魂提交
							
							
							
							
							
						 | 
						
							2021-10-26 16:00:31 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								06a8251a40
								
							
								
							
						 | 
						
							
							
								
								神魂界面提交
							
							
							
							
							
						 | 
						
							2021-10-20 18:02:09 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								097d5cf1cc
								
							
								
							
						 | 
						
							
							
								
								神魂初版提交
							
							
							
							
							
						 | 
						
							2021-10-18 10:36:32 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b21e7efe0d
								
							
								
							
						 | 
						
							
							
								
								【角色信息】修复跳转到角色信息界面,点击左右箭头报错
							
							
							
							
							
						 | 
						
							2021-09-26 17:38:23 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								66efc9d4e3
								
							
								
							
						 | 
						
							
							
								
								【战斗力】新战斗力计算系统完成
							
							
							
							
							
						 | 
						
							2021-09-16 13:35:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7df51e8929
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/角色战斗力计算2
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua 
							
						 | 
						
							2021-09-11 16:52:33 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3a102c93fa
								
							
								
							
						 | 
						
							
							
								
								【觉醒】神将界面觉醒显示
							
							
							
							
							
						 | 
						
							2021-08-26 18:54:14 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								eebd99883b
								
							
								
							
						 | 
						
							
							
								
								【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题
							
							
							
							
							
						 | 
						
							2021-08-25 20:59:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								917662ff20
								
							
								
							
						 | 
						
							
							
								
								宝物培养红点提交
							
							
							
							
							
						 | 
						
							2021-07-26 17:16:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								734efe7b52
								
							
								
							
						 | 
						
							
							
								
								红点修改提交
							
							
							
							
							
						 | 
						
							2021-07-24 19:36:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								febee39f82
								
							
								
							
						 | 
						
							
							
								
								【英雄升级】英雄长按升级时不再进行切换操作
							
							
							
							
							
						 | 
						
							2021-07-12 10:33:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4531a9636a
								
							
								
							
						 | 
						
							
							
								
								神将界面层级修改提交
							
							
							
							
							
							
							
							(cherry picked from commit 1e18e57b12) 
							
						 | 
						
							2021-07-09 18:41:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								13d7b61e35
								
							
								
							
						 | 
						
							
							
								
								【神将信息】修复切换到装备界面返回无法切换页签的问题
							
							
							
							
							
						 | 
						
							2021-06-15 11:17:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fe1570f667
								
							
								
							
						 | 
						
							
							
								
								神将详情界面修改提交
							
							
							
							
							
						 | 
						
							2021-06-11 16:09:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9b13236cfc
								
							
								
							
						 | 
						
							
							
								
								添加限制皮肤显示
							
							
							
							
							
						 | 
						
							2021-06-03 10:59:54 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								41152acae9
								
							
								
							
						 | 
						
							
							
								
								【修行】排行榜界面,神将界面、神将替换提示调整
							
							
							
							
							
						 | 
						
							2021-05-25 11:54:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3f7e243b70
								
							
								
							
						 | 
						
							
							
								
								【修行】this.spLoader提交
							
							
							
							
							
						 | 
						
							2021-05-20 09:48:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								be1085d2bb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev-c' into 0功能/修行玩法
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Atlas/ActivityAltas/r_huodong_tiao02.png.meta
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua 
							
						 | 
						
							2021-05-19 20:01:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b88957bcad
								
							
								
							
						 | 
						
							
							
								
								【修行】神将增加神印显示
							
							
							
							
							
						 | 
						
							2021-05-18 20:04:52 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f1c10a99e9
								
							
								
							
						 | 
						
							
							
								
								【ios推荐】白片处理
							
							
							
							
							
						 | 
						
							2021-04-22 21:34:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								fa61ea1317
								
							
								
							
						 | 
						
							
							
								
								【ios推荐服】白片处理,修复无尽副本无法返回,修复副本回到主界面点击其他页签黑屏
							
							
							
							
							
						 | 
						
							2021-04-22 20:39:30 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3819869e27
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/ios
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleSkinPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua 
							
						 | 
						
							2021-04-21 17:54:16 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								30b329a837
								
							
								
							
						 | 
						
							
							
								
								【ios】图片回收
							
							
							
							
							
						 | 
						
							2021-04-21 13:12:04 +08:00 | 
						
					
				
					
						
							
							
								 
								JLIOSM1
							
						 | 
						
							
							
							
							
								
							
								c31a82ef7f
								
							
								
							
						 | 
						
							
							
								
								【ios】lua文件格式修改
							
							
							
							
							
						 | 
						
							2021-04-20 13:58:00 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								20e064b178
								
							
								
							
						 | 
						
							
							
								
								英雄左右快速切换 ui 重叠
							
							
							
							
							
						 | 
						
							2021-04-19 21:29:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c790d3ba8b
								
							
								
							
						 | 
						
							
							
								
								【神将图鉴】图鉴和已有神将的详情或者传说互相切换,就会为空
							
							
							
							
							
						 | 
						
							2021-04-19 21:26:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3fb2bae218
								
							
								
							
						 | 
						
							
							
								
								英雄左右快速切换 ui 重叠
							
							
							
							
							
						 | 
						
							2021-04-19 19:36:43 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1f6b8de581
								
							
								
							
						 | 
						
							
							
								
								【英雄详情】修改
							
							
							
							
							
						 | 
						
							2021-04-17 17:50:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c844a72609
								
							
								
							
						 | 
						
							
							
								
								【神将图鉴】图鉴和已有神将的详情或者传说互相切换,就会为空
							
							
							
							
							
						 | 
						
							2021-04-15 19:54:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								071a91773a
								
							
								
							
						 | 
						
							
							
								
								导出 文本提交
							
							
							
							
							
						 | 
						
							2021-04-09 12:26:35 +08:00 |