gaoxin
							
						 | 
						
							
							
							
							
								
							
								d1b84299c2
								
							
								
							
						 | 
						
							
							
								
								【修行优化】点击圆点弹出TIPS后,切换点击其他圆点应切换TIPS内容,而非关闭之前的TIPS
							
							
							
							
							
						 | 
						
							2022-01-03 02:43:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e6d1ac6ef0
								
							
								
							
						 | 
						
							
							
								
								【修行】冲突修改
							
							
							
							
							
						 | 
						
							2021-12-23 09:53:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d91811a555
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-13 17:26:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d3a2fdf110
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-10 16:07:46 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								82c89e5e7d
								
							
								
							
						 | 
						
							
							
								
								【命格】提交
							
							
							
							
							
						 | 
						
							2021-12-10 13:57:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								06d532a9bc
								
							
								
							
						 | 
						
							
							
								
								【命格】开坑
							
							
							
							
							
						 | 
						
							2021-12-06 14:06:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6bf98e7c9f
								
							
								
							
						 | 
						
							
							
								
								【修行】结构修改
							
							
							
							
							
						 | 
						
							2021-12-06 13:02:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2e2c4292b6
								
							
								
							
						 | 
						
							
							
								
								【引导】修复修为引导位置错误
							
							
							
							
							
						 | 
						
							2021-11-30 21:27:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b6bcd50dd3
								
							
								
							
						 | 
						
							
							
								
								身外化身修改提交
							
							
							
							
							
						 | 
						
							2021-11-26 14:11:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c0c8a6710c
								
							
								
							
						 | 
						
							
							
								
								身外化身提交
							
							
							
							
							
						 | 
						
							2021-11-26 11:08:48 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a248330241
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/Incarnation
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua 
							
						 | 
						
							2021-11-25 16:10:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1c9d113a86
								
							
								
							
						 | 
						
							
							
								
								【活动、修为】界面调整
							
							
							
							
							
						 | 
						
							2021-11-25 11:52:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								bc62311af9
								
							
								
							
						 | 
						
							
							
								
								法宝之魂第二个界面提交
							
							
							
							
							
						 | 
						
							2021-11-19 16:52:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								808dcddc62
								
							
								
							
						 | 
						
							
							
								
								法宝聚灵界面1提交
							
							
							
							
							
						 | 
						
							2021-11-19 11:33:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4d887421ea
								
							
								
							
						 | 
						
							
							
								
								身外化身提交
							
							
							
							
							
						 | 
						
							2021-11-18 11:55:26 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1e4a7a57be
								
							
								
							
						 | 
						
							
							
								
								法宝之魂 提交
							
							
							
							
							
						 | 
						
							2021-11-16 15:24:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e6f4e50656
								
							
								
							
						 | 
						
							
							
								
								法宝聚灵
							
							
							
							
							
						 | 
						
							2021-11-15 18:24:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f8b43c4c30
								
							
								
							
						 | 
						
							
							
								
								修行星星修改提交
							
							
							
							
							
						 | 
						
							2021-11-05 15:23:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								81dadae61f
								
							
								
							
						 | 
						
							
							
								
								【界面优化】提交
							
							
							
							
							
						 | 
						
							2021-11-02 16:58:48 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0c1044ab67
								
							
								
							
						 | 
						
							
							
								
								Revert "Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法""
							
							
							
							
							
							
							
							This reverts commit d2c8daffce. 
							
						 | 
						
							2021-11-01 18:59:21 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangshanxue
							
						 | 
						
							
							
							
							
								
							
								d2c8daffce
								
							
								
							
						 | 
						
							
							
								
								Revert "【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法"
							
							
							
							
							
							
							
							This reverts commit 87210b9d73. 
							
						 | 
						
							2021-11-01 18:53:39 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								87210b9d73
								
							
								
							
						 | 
						
							
							
								
								【界面优化】寻宝特权,秘宝试炼、解锁秘宝、四象心法
							
							
							
							
							
						 | 
						
							2021-11-01 17:21:59 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								c48a16bb6c
								
							
								
							
						 | 
						
							
							
								
								[主角技能]=====技能升级界面预设修改提交
							
							
							
							
							
						 | 
						
							2021-10-26 15:17:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7871064069
								
							
								
							
						 | 
						
							
							
								
								【修为】Tips修改
							
							
							
							
							
						 | 
						
							2021-10-25 11:54:04 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d93e0a9c4e
								
							
								
							
						 | 
						
							
							
								
								角色技能升级按钮添加动效
							
							
							
							
							
						 | 
						
							2021-10-22 13:15:08 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4518c8c175
								
							
								
							
						 | 
						
							
							
								
								修行技能bug修改提交
							
							
							
							
							
						 | 
						
							2021-10-22 11:56:46 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ae47df29bb
								
							
								
							
						 | 
						
							
							
								
								【红点】=============修行技能红点提交
							
							
							
							
							
						 | 
						
							2021-10-22 10:08:53 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								bb849d4b93
								
							
								
							
						 | 
						
							
							
								
								主角技能界面修改
							
							
							
							
							
						 | 
						
							2021-10-21 11:58:33 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								205200268d
								
							
								
							
						 | 
						
							
							
								
								【主角修为】提交
							
							
							
							
							
						 | 
						
							2021-10-21 10:58:09 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								a17242b0c0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/玉虚论道
							
							
							
							
							
							
							
							Conflicts:
	Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
	Assets/ManagedResources/~Lua/Data/ConfigData.lua
	Assets/ManagedResources/~Lua/Data/UIData.lua
	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
	Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua 
							
						 | 
						
							2021-10-20 22:13:29 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								24f0812b9f
								
							
								
							
						 | 
						
							
							
								
								主角技能提交
							
							
							
							
							
						 | 
						
							2021-10-20 21:33:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								65c676eda9
								
							
								
							
						 | 
						
							
							
								
								【主角修为】文字调整
							
							
							
							
							
						 | 
						
							2021-10-20 15:11:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0d8af528ff
								
							
								
							
						 | 
						
							
							
								
								【主角修为】引导提交
							
							
							
							
							
						 | 
						
							2021-10-20 15:09:59 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								76cfad3419
								
							
								
							
						 | 
						
							
							
								
								【主角修为】完成提交
							
							
							
							
							
						 | 
						
							2021-10-20 13:15:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a387432369
								
							
								
							
						 | 
						
							
							
								
								【主角修为】提交
							
							
							
							
							
						 | 
						
							2021-10-19 18:34:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2d982e67d3
								
							
								
							
						 | 
						
							
							
								
								【主角修为】提交
							
							
							
							
							
						 | 
						
							2021-10-19 15:34:43 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b5f27a64af
								
							
								
							
						 | 
						
							
							
								
								主角技能提交
							
							
							
							
							
						 | 
						
							2021-10-19 10:00:34 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								854f2df748
								
							
								
							
						 | 
						
							
							
								
								【四灵试炼】增加一行文字
							
							
							
							
							
						 | 
						
							2021-11-02 02:46:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5af10faa57
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-23 19:23:27 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								bdeade9d71
								
							
								
							
						 | 
						
							
							
								
								【四象心法】点击消耗道具显示详情
							
							
							
							
							
						 | 
						
							2021-09-22 20:08:43 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								0d6e6908b9
								
							
								
							
						 | 
						
							
							
								
								【四象心法】bug修改
							
							
							
							
							
						 | 
						
							2021-09-11 17:59:27 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								a89d168e50
								
							
								
							
						 | 
						
							
							
								
								【四象心法】功能完善
							
							
							
							
							
						 | 
						
							2021-09-10 14:37:47 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								1327abb290
								
							
								
							
						 | 
						
							
							
								
								四象心法修改
							
							
							
							
							
						 | 
						
							2021-09-10 11:22:08 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								4c66f50e66
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/四象心法
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua 
							
						 | 
						
							2021-09-10 09:38:55 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								247ad9fdc7
								
							
								
							
						 | 
						
							
							
								
								【四象心法提交】
							
							
							
							
							
						 | 
						
							2021-09-09 20:45:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								68ed8e3b40
								
							
								
							
						 | 
						
							
							
								
								位置修改
							
							
							
							
							
						 | 
						
							2021-09-02 11:42:43 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								264328e859
								
							
								
							
						 | 
						
							
							
								
								适配修改
							
							
							
							
							
						 | 
						
							2021-09-02 11:38:49 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1744845cba
								
							
								
							
						 | 
						
							
							
								
								建木神树转移到修行
							
							
							
							
							
						 | 
						
							2021-09-01 11:57:15 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0598fe8bdf
								
							
								
							
						 | 
						
							
							
								
								【修行特效】
							
							
							
							
							
						 | 
						
							2021-06-10 13:45:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								45602214d8
								
							
								
							
						 | 
						
							
							
								
								【修行】特效增加
							
							
							
							
							
						 | 
						
							2021-05-27 17:57:49 +08:00 |