zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a417e88b0b
								
							
								
							
						 | 
						
							
							
								
								恭送编队不检测大门闹天宫  and  车迟斗法失败刷新顺序修改
							
							
							
							
							
						 | 
						
							2020-08-10 11:30:27 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cca8355c33
								
							
								
							
						 | 
						
							
							
								
								神将合成提交
							
							
							
							
							
						 | 
						
							2020-08-10 11:28:25 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								93e1d880c8
								
							
								
							
						 | 
						
							
							
								
								英雄合成界面拼接
							
							
							
							
							
						 | 
						
							2020-08-06 18:34:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e0359bb37a
								
							
								
							
						 | 
						
							
							
								
								encoding upate
							
							
							
							
							
						 | 
						
							2020-08-06 17:52:32 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3bb0906865
								
							
								
							
						 | 
						
							
							
								
								法宝归元中文表
							
							
							
							
							
						 | 
						
							2020-08-06 10:38:55 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4533695a3d
								
							
								
							
						 | 
						
							
							
								
								法宝归元界面提交
							
							
							
							
							
						 | 
						
							2020-08-07 12:22:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b2a54634d2
								
							
								
							
						 | 
						
							
							
								
								适配调整   巅峰赛入口
							
							
							
							
							
						 | 
						
							2020-08-15 00:08:25 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b0002cf781
								
							
								
							
						 | 
						
							
							
								
								语言文字替换
							
							
							
							
							
						 | 
						
							2020-07-25 20:42:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								46f091f09c
								
							
								
							
						 | 
						
							
							
								
								头像框修改提交
							
							
							
							
							
						 | 
						
							2020-07-25 20:28:41 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								caadda04e1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab 
							
						 | 
						
							2020-07-24 20:04:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								064b819f4a
								
							
								
							
						 | 
						
							
							
								
								修改星星提交
							
							
							
							
							
						 | 
						
							2020-07-24 20:03:06 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f27300721a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-24 12:14:52 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1f5440c2e6
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2020-07-24 12:11:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f8abe77d82
								
							
								
							
						 | 
						
							
							
								
								归元时检测大闹天宫队伍的神将
							
							
							
							
							
						 | 
						
							2020-07-22 19:07:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2ecf69827f
								
							
								
							
						 | 
						
							
							
								
								归元修改提交
							
							
							
							
							
						 | 
						
							2020-07-22 16:31:31 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								be357f9268
								
							
								
							
						 | 
						
							
							
								
								【归元】三星卡不在归元列表显示,不能对三星的归元
							
							
							
							
							
						 | 
						
							2020-07-22 16:25:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ba8b5a3c93
								
							
								
							
						 | 
						
							
							
								
								【宝物合成】一键合成预览处显示错误
							
							
							
							
							
						 | 
						
							2020-07-22 15:50:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								adc3b71e40
								
							
								
							
						 | 
						
							
							
								
								分解修改提交
							
							
							
							
							
						 | 
						
							2020-07-16 10:49:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								798c730f56
								
							
								
							
						 | 
						
							
							
								
								公会红点显示,
							
							
							
							
							
						 | 
						
							2020-07-14 15:54:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								40fa614a52
								
							
								
							
						 | 
						
							
							
								
								限时召唤】点十连,单抽的免费不显示了
							
							
							
							
							
						 | 
						
							2020-07-13 12:01:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6ff6b5315b
								
							
								
							
						 | 
						
							
							
								
								分解、重置相关功能修改
							
							
							
							
							
						 | 
						
							2020-07-13 11:15:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fdf82e47ac
								
							
								
							
						 | 
						
							
							
								
								分解、重置相关功能修改
							
							
							
							
							
						 | 
						
							2020-07-11 18:00:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								106a7f7763
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua 
							
						 | 
						
							2020-07-11 16:25:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0fb81547d3
								
							
								
							
						 | 
						
							
							
								
								分解提交
							
							
							
							
							
						 | 
						
							2020-07-11 16:21:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								310802e967
								
							
								
							
						 | 
						
							
							
								
								language导出
							
							
							
							
							
						 | 
						
							2020-07-10 19:13:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3a85c6e339
								
							
								
							
						 | 
						
							
							
								
								分解,限时召唤提交
							
							
							
							
							
						 | 
						
							2020-07-10 18:29:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c15b84b096
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into equip
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua 
							
						 | 
						
							2020-07-07 18:13:34 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bff7df21e4
								
							
								
							
						 | 
						
							
							
								
								装备出售界面添加
							
							
							
							
							
						 | 
						
							2020-07-07 15:20:43 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								8eaa1f6e8c
								
							
								
							
						 | 
						
							
							
								
								增加 图鉴、神将归元、恭送神将界面“全部”按钮
							
							
							
							
							
						 | 
						
							2020-07-07 10:57:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7f54e3c88a
								
							
								
							
						 | 
						
							
							
								
								装备提交
							
							
							
							
							
						 | 
						
							2020-07-06 20:35:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								105d3bf53e
								
							
								
							
						 | 
						
							
							
								
								宝器分解计算掉落
							
							
							
							
							
						 | 
						
							2020-07-06 19:11:15 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4b8bae38b3
								
							
								
							
						 | 
						
							
							
								
								宝物分解界面提交
							
							
							
							
							
						 | 
						
							2020-07-06 16:27:27 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								b3c70f66e4
								
							
								
							
						 | 
						
							
							
								
								svn逻辑tongbu
							
							
							
							
							
						 | 
						
							2020-07-01 18:14:03 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								c4751eed0a
								
							
								
							
						 | 
						
							
							
								
								svn逻辑同步
							
							
							
							
							
						 | 
						
							2020-07-01 10:54:39 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d08552ca2f
								
							
								
							
						 | 
						
							
							
								
								外网0.16.13 内网0.15.24
							
							
							
							
							
						 | 
						
							2020-06-30 18:59:44 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								7382b2db77
								
							
								
							
						 | 
						
							
							
								
								版本开发提交
							
							
							
							
							
						 | 
						
							2020-06-28 17:52:29 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d87ab3767e
								
							
								
							
						 | 
						
							
							
								
								内网 0.15.20
							
							
							
							
							
						 | 
						
							2020-06-23 18:36:24 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								59db757cf9
								
							
								
							
						 | 
						
							
							
								
								六月三号开发提交
							
							
							
							
							
						 | 
						
							2020-06-03 19:09:01 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								063868ce73
								
							
								
							
						 | 
						
							
							
								
								外网包 0.16.1
							
							
							
							
							
						 | 
						
							2020-05-25 19:16:23 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								266b9065d8
								
							
								
							
						 | 
						
							
							
								
								测试版本 带热更 0.15.1
							
							
							
							
							
						 | 
						
							2020-05-15 16:52:35 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								4c8d2cf8de
								
							
								
							
						 | 
						
							
							
								
								提交
							
							
							
							
							
						 | 
						
							2020-05-09 13:31:21 +08:00 |