ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2ab6d17841
								
							
								
							
						 | 
						
							
							
								
								森罗小游戏修改
							
							
							
							
							
						 | 
						
							2020-07-14 21:03:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								592d3385e8
								
							
								
							
						 | 
						
							
							
								
								129  战力计算
							
							
							
							
							
						 | 
						
							2020-07-14 14:49:15 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b2c9b88991
								
							
								
							
						 | 
						
							
							
								
								【装备】在成员信息界面,点击主线编队内的神将信息,穿戴的装备可以分解
							
							
							
							
							
						 | 
						
							2020-07-13 16:16:56 +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 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c6bfa772e5
								
							
								
							
						 | 
						
							
							
								
								装备提交
							
							
							
							
							
						 | 
						
							2020-07-07 16:35:57 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bff7df21e4
								
							
								
							
						 | 
						
							
							
								
								装备出售界面添加
							
							
							
							
							
						 | 
						
							2020-07-07 15:20:43 +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 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								94a160d682
								
							
								
							
						 | 
						
							
							
								
								修改玩家信息时,应按照位置顺序显示该玩家主线阵容
							
							
							
							
							
						 | 
						
							2020-07-04 16:11:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								74830b4b90
								
							
								
							
						 | 
						
							
							
								
								开服狂欢奖励预览返回按钮不关闭预览bug
							
							
							
							
							
						 | 
						
							2020-07-04 14:24:30 +08:00 | 
						
					
				
					
						
							
							
								 
								2han9B1a0
							
						 | 
						
							
							
							
							
								
							
								abfbfc423b
								
							
								
							
						 | 
						
							
							
								
								心魔文字修改、成长基金开启条件修改、文字:传说修改、四元阵卡池显示修改、自选宝箱提示修改
							
							
							
							
							
						 | 
						
							2020-07-03 11:27:25 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								edc24d7efd
								
							
								
							
						 | 
						
							
							
								
								修复获取奖励卡顿的问题
							
							
							
							
							
						 | 
						
							2020-07-02 17:01:40 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								461c64b04a
								
							
								
							
						 | 
						
							
							
								
								svn逻辑同步
							
							
							
							
							
						 | 
						
							2020-07-02 14:53:44 +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
							
						 | 
						
							
							
							
							
								
							
								8c61581548
								
							
								
							
						 | 
						
							
							
								
								外网 0.16.10  内网 0.15.23
							
							
							
							
							
						 | 
						
							2020-06-28 17:48:49 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								d87ab3767e
								
							
								
							
						 | 
						
							
							
								
								内网 0.15.20
							
							
							
							
							
						 | 
						
							2020-06-23 18:36:24 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								75a3f83194
								
							
								
							
						 | 
						
							
							
								
								内网0.15.16 外网 0.16.7
							
							
							
							
							
						 | 
						
							2020-06-19 20:19:35 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								7a410e1b60
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.5
							
							
							
							
							
						 | 
						
							2020-06-19 16:18:05 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								e189462ac9
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.14
							
							
							
							
							
						 | 
						
							2020-06-18 20:39:29 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								cf5f3e9952
								
							
								
							
						 | 
						
							
							
								
								内网测试 0.15.12
							
							
							
							
							
						 | 
						
							2020-06-13 11:47:13 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								2db43096de
								
							
								
							
						 | 
						
							
							
								
								补充提交
							
							
							
							
							
						 | 
						
							2020-06-12 18:04:22 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								90e12f1a4a
								
							
								
							
						 | 
						
							
							
								
								外网0.16.5,测试0.15.11
							
							
							
							
							
						 | 
						
							2020-06-08 20:18:49 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								b499b77bbe
								
							
								
							
						 | 
						
							
							
								
								外网0.16.4版本热更
							
							
							
							
							
						 | 
						
							2020-06-08 13:57:30 +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
							
						 | 
						
							
							
							
							
								
							
								7dea7af830
								
							
								
							
						 | 
						
							
							
								
								同步
							
							
							
							
							
						 | 
						
							2020-05-15 17:03:13 +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 |