wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								0d08ea1a84
								
							
								
							
						 | 
						
							
							
								
								法灵提交
							
							
							
							
							
						 | 
						
							2023-10-26 17:16:10 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a66437ec72
								
							
								
							
						 | 
						
							
							
								
								潜能提交
							
							
							
							
							
						 | 
						
							2023-10-16 15:12:47 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e80056fcd4
								
							
								
							
						 | 
						
							
							
								
								查看礼物信息提交
							
							
							
							
							
						 | 
						
							2023-09-13 15:44:06 +08:00 | 
						
					
				
					
						
							
							
								
								 wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								eeb3859f72
								
							
								
							
						 | 
						
							
							
								
								礼物功能提交
							
							
							
							
							
						 | 
						
							2023-09-13 14:57:48 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5aeffabd6f
								
							
								
							
						 | 
						
							
							
								
								助战法相信息显示修改
							
							
							
							
							
						 | 
						
							2023-03-10 13:29:22 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d84f374bf2
								
							
								
							
						 | 
						
							
							
								
								法相修改提交
							
							
							
							
							
						 | 
						
							2023-02-19 20:08:48 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								c2f2f9255b
								
							
								
							
						 | 
						
							
							
								
								法相修改提交
							
							
							
							
							
						 | 
						
							2023-02-18 15:52:52 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								98ddf9b5c2
								
							
								
							
						 | 
						
							
							
								
								法相相关脚本预设提交
							
							
							
							
							
						 | 
						
							2023-02-18 13:31:36 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4c82f2d58c
								
							
								
							
						 | 
						
							
							
								
								【装备】======添加特效
							
							
							
							
							
						 | 
						
							2022-06-15 10:31:10 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ad64dfd009
								
							
								
							
						 | 
						
							
							
								
								[引导]======神印引导修改提交
							
							
							
							
							
						 | 
						
							2022-05-20 11:16:54 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								27ea9fd92c
								
							
								
							
						 | 
						
							
							
								
								查看他人英雄技能修改提交
							
							
							
							
							
						 | 
						
							2022-05-19 22:24:02 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d1970ed6cc
								
							
								
							
						 | 
						
							
							
								
								他人英雄详情修改
							
							
							
							
							
						 | 
						
							2022-05-19 22:12:14 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d4a6bfdda2
								
							
								
							
						 | 
						
							
							
								
								【神将排版优化】========神将信息界面修改
							
							
							
							
							
						 | 
						
							2022-05-18 20:00:57 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ca2b699259
								
							
								
							
						 | 
						
							
							
								
								神印提交
							
							
							
							
							
						 | 
						
							2022-04-22 18:23:01 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e0ec7f2dec
								
							
								
							
						 | 
						
							
							
								
								[bug]====英雄信息修改
							
							
							
							
							
						 | 
						
							2022-04-02 17:47:30 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a13dd2939a
								
							
								
							
						 | 
						
							
							
								
								[功能]================神系英雄添加提叫
							
							
							
							
							
						 | 
						
							2022-03-28 18:18:19 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								01506ba48c
								
							
								
							
						 | 
						
							
							
								
								[角色天赋]======角色天赋显示修改
							
							
							
							
							
						 | 
						
							2022-02-10 17:52:40 +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
							
						 | 
						
							
							
							
							
								
							
								ff7b7ba5ed
								
							
								
							
						 | 
						
							
							
								
								[飞升]=====bug修改提交
							
							
							
							
							
						 | 
						
							2022-01-12 16:41:51 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9f8ee231ac
								
							
								
							
						 | 
						
							
							
								
								【装备界面】排行榜数据错误修改
							
							
							
							
							
						 | 
						
							2022-01-11 17:51:56 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								1b39fbdbe9
								
							
								
							
						 | 
						
							
							
								
								【飞升】===========神魂后星级显示修改
							
							
							
							
							
						 | 
						
							2022-01-10 15:11:30 +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 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7c0726e5b9
								
							
								
							
						 | 
						
							
							
								
								【神将详情】根据魂印的显示修改界面的大小
							
							
							
							
							
						 | 
						
							2022-01-06 12:03:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2f03bf5ab7
								
							
								
							
						 | 
						
							
							
								
								【家园】提交
							
							
							
							
							
						 | 
						
							2022-01-05 19:12:54 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5b670023ed
								
							
								
							
						 | 
						
							
							
								
								[飞升]=======飞升代码逻辑提交
							
							
							
							
							
						 | 
						
							2022-01-05 18:17:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cf9cbc5ac9
								
							
								
							
						 | 
						
							
							
								
								【家园】摘星阁装备属性加持+战斗力
							
							
							
							
							
						 | 
						
							2021-12-31 13:44:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c8e7d0cdd4
								
							
								
							
						 | 
						
							
							
								
								编队界面看神将情报错误修改
							
							
							
							
							
						 | 
						
							2021-11-12 15:51:26 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f18880622e
								
							
								
							
						 | 
						
							
							
								
								【新·魂灵宝】提交
							
							
							
							
							
						 | 
						
							2021-11-09 17:06:47 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								12e46be512
								
							
								
							
						 | 
						
							
							
								
								【装备界面】提交
							
							
							
							
							
						 | 
						
							2021-11-09 10:22:16 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e99f8c285f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-11-08 14:02:57 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								95b7fceb34
								
							
								
							
						 | 
						
							
							
								
								[神魂]======神魂升级后技能描述修改
							
							
							
							
							
						 | 
						
							2021-11-08 14:02:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								024b684999
								
							
								
							
						 | 
						
							
							
								
								排行榜神魂放大镜显示错误修改
							
							
							
							
							
						 | 
						
							2021-11-08 10:51:51 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a92a76e3ab
								
							
								
							
						 | 
						
							
							
								
								【神魂】=====技能描述修改
							
							
							
							
							
						 | 
						
							2021-11-05 17:21:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0d68d9229b
								
							
								
							
						 | 
						
							
							
								
								神魂提交
							
							
							
							
							
						 | 
						
							2021-11-05 10:18:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								34d8cf4440
								
							
								
							
						 | 
						
							
							
								
								神魂位置提交
							
							
							
							
							
						 | 
						
							2021-11-04 09:27:56 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								125e37fe6d
								
							
								
							
						 | 
						
							
							
								
								神魂提交
							
							
							
							
							
						 | 
						
							2021-11-03 10:13:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d4d9b88fe7
								
							
								
							
						 | 
						
							
							
								
								神魂修改提交
							
							
							
							
							
						 | 
						
							2021-10-27 15:24:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d398c21668
								
							
								
							
						 | 
						
							
							
								
								神魂提交
							
							
							
							
							
						 | 
						
							2021-10-27 12:50:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5e8ad7dd08
								
							
								
							
						 | 
						
							
							
								
								神魂提交
							
							
							
							
							
						 | 
						
							2021-10-26 16:00:31 +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 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7713a65826
								
							
								
							
						 | 
						
							
							
								
								排行榜宝器修改
							
							
							
							
							
						 | 
						
							2021-08-31 11:08:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1ea100ed83
								
							
								
							
						 | 
						
							
							
								
								神将情报界面装备宝物修改提交
							
							
							
							
							
						 | 
						
							2021-08-30 16:44:26 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								c957a96983
								
							
								
							
						 | 
						
							
							
								
								【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级
							
							
							
							
							
						 | 
						
							2021-08-09 14:48:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								abb9873f80
								
							
								
							
						 | 
						
							
							
								
								【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级
							
							
							
							
							
						 | 
						
							2021-08-04 17:42:47 +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 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e7dff66a4f
								
							
								
							
						 | 
						
							
							
								
								品阶错误修改
							
							
							
							
							
						 | 
						
							2021-03-29 10:15:25 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								aa94edf1d7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' into 0功能/本周版本优化内容
							
							
							
							
							
						 | 
						
							2021-03-12 16:41:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								51c0b51a87
								
							
								
							
						 | 
						
							
							
								
								【本地化】魂灵宝处需要修改
							
							
							
							
							
						 | 
						
							2021-03-12 15:07:17 +08:00 |