gaoxin
							
						 | 
						
							
							
							
							
								
							
								4b165e3551
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/背包最大值限制提示添加' into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-27 17:18:01 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b173c4384a
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/系统消息结构处理' into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-27 17:17:57 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8eb823937e
								
							
								
							
						 | 
						
							
							
								
								【系统消息】暂时屏蔽法宝详情的显示
							
							
							
							
							
						 | 
						
							2020-11-27 15:06:58 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7ee6f446b3
								
							
								
							
						 | 
						
							
							
								
								【背包】背包已满提示方式改为tips
							
							
							
							
							
						 | 
						
							2020-11-27 14:00:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d0cb62fab6
								
							
								
							
						 | 
						
							
							
								
								【背包】物品最大数量限制提示添加
							
							
							
							
							
						 | 
						
							2020-11-27 13:31:24 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								80c949c54d
								
							
								
							
						 | 
						
							
							
								
								【灵兽】 灵兽数据分页
							
							
							
							
							
						 | 
						
							2020-11-27 10:57:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ad9c72717a
								
							
								
							
						 | 
						
							
							
								
								【系统消息】修改系统消息点击法宝相关消息显示为一级的法宝信息
							
							
							
							
							
						 | 
						
							2020-11-27 10:49:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2df4f34c76
								
							
								
							
						 | 
						
							
							
								
								【编队优化】切磋增加一键
							
							
							
							
							
							
							
							(cherry picked from commit e7a178aa0d99c0e9257c029ecabac2dac0a9b9d4) 
							
						 | 
						
							2020-11-26 16:09:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								13e2fbb98d
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/竞技场胜负奖励' into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-26 11:11:57 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3f2029a681
								
							
								
							
						 | 
						
							
							
								
								旗开得胜 提交
							
							
							
							
							
						 | 
						
							2020-11-25 21:02:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								be9b79897e
								
							
								
							
						 | 
						
							
							
								
								【竞技场】增加产出
							
							
							
							
							
						 | 
						
							2020-11-25 18:23:33 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								4b6578e957
								
							
								
							
						 | 
						
							
							
								
								[战斗]  91  112 115  196  256 被动添加特性屏蔽修改
							
							
							
							
							
						 | 
						
							2020-11-24 11:31:02 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								2cc096cd18
								
							
								
							
						 | 
						
							
							
								
								【战斗】147,206被动修改回原来的效果
							
							
							
							
							
						 | 
						
							2020-11-24 11:24:29 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								e3e609c87e
								
							
								
							
						 | 
						
							
							
								
								[战斗]  245-256被动修改,修改英雄身上如果有两个相同类型被动只能触发一个的问题
							
							
							
							
							
						 | 
						
							2020-11-24 11:23:31 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								34ae0ed497
								
							
								
							
						 | 
						
							
							
								
								【战斗】无用log删除,技能数量限制初始化数据位置错误
							
							
							
							
							
						 | 
						
							2020-11-23 21:36:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5e4f1a5165
								
							
								
							
						 | 
						
							
							
								
								v1.0.7
							
							
							
							
							
							
							
							1、修复单个回合技能上限数值会在后端累加,当一场战斗结束此数值刚好达到上限时,下一场战斗毕定卡死的问题 
							
						 | 
						
							2020-11-23 10:08:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d938acc273
								
							
								
							
						 | 
						
							
							
								
								【竞技场】增加输赢奖励掉落
							
							
							
							
							
						 | 
						
							2020-11-23 09:58:22 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								85a608d21a
								
							
								
							
						 | 
						
							
							
								
								Revert "Revert "【战斗】v1.0.5""
							
							
							
							
							
							
							
							This reverts commit 941cb86845. 
							
						 | 
						
							2020-11-20 15:15:45 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								941cb86845
								
							
								
							
						 | 
						
							
							
								
								Revert "【战斗】v1.0.5"
							
							
							
							
							
							
							
							This reverts commit 0548b16015. 
							
						 | 
						
							2020-11-20 15:07:27 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2331c8d013
								
							
								
							
						 | 
						
							
							
								
								【战斗】添加超时检测
							
							
							
							
							
						 | 
						
							2020-11-20 15:07:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0548b16015
								
							
								
							
						 | 
						
							
							
								
								【战斗】v1.0.5
							
							
							
							
							
							
							
							1、修复人物行动前被持续伤害击杀,触发被击杀时追加技能,释放技能后战斗卡死的问题
 2、添加每回合技能释放数量上限 
							
						 | 
						
							2020-11-20 14:27:23 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								899903104f
								
							
								
							
						 | 
						
							
							
								
								【特权礼包】加等级显示前端
							
							
							
							
							
							
							
							【公会副本】 加前端五点刷新不能扫荡 
							
						 | 
						
							2020-11-19 19:30:46 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								532e766de5
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-19 17:37:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d789b9e98e
								
							
								
							
						 | 
						
							
							
								
								【编队优化】轩辕宝镜一键特殊处理
							
							
							
							
							
						 | 
						
							2020-11-19 17:37:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c5c4efef63
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/增加一键上阵' into master_xma_local
							
							
							
							
							
						 | 
						
							2020-12-03 05:30:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8198b24720
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-19 17:22:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1299b62feb
								
							
								
							
						 | 
						
							
							
								
								灵兽宝阁位置名称修改
							
							
							
							
							
						 | 
						
							2020-11-19 17:22:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								37631ebc67
								
							
								
							
						 | 
						
							
							
								
								【战斗】技能特效播放层级修改
							
							
							
							
							
						 | 
						
							2020-11-19 15:44:23 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8ceb1b4a51
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-19 15:28:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								68cf2e356a
								
							
								
							
						 | 
						
							
							
								
								【竞技场】在线刷新没红点修复
							
							
							
							
							
						 | 
						
							2020-12-03 05:10:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3b4826c235
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-12-03 04:56:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2fbe5aa120
								
							
								
							
						 | 
						
							
							
								
								【大闹天宫】重置前五分钟踢出玩家
							
							
							
							
							
						 | 
						
							2020-12-03 04:55:51 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								20564aee0f
								
							
								
							
						 | 
						
							
							
								
								【日常副本】解锁所有副本后,没有自动滚动到最后一个副本
							
							
							
							
							
						 | 
						
							2020-11-19 15:28:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0914dd6dc8
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-19 15:09:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2c72089def
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】掷骰子播放时需要加限制,不能点击关闭,或者直接显示结果
							
							
							
							
							
						 | 
						
							2020-11-19 15:09:00 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								59937a1132
								
							
								
							
						 | 
						
							
							
								
								【战斗】修改自动下落特效的时间为表配置
							
							
							
							
							
						 | 
						
							2020-11-19 14:53:45 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d8f31bab35
								
							
								
							
						 | 
						
							
							
								
								主题活动修改提交
							
							
							
							
							
						 | 
						
							2020-11-19 14:26:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e09872eb7f
								
							
								
							
						 | 
						
							
							
								
								限时招募修改提交
							
							
							
							
							
						 | 
						
							2020-11-19 10:35:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3e7c24c029
								
							
								
							
						 | 
						
							
							
								
								【主题活动】降龙伏虎
							
							
							
							
							
						 | 
						
							2020-11-18 18:15:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								08657b4ffd
								
							
								
							
						 | 
						
							
							
								
								【编队优化】车迟 十绝 增加一键
							
							
							
							
							
						 | 
						
							2020-11-18 10:48:35 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ca1a509cb8
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复资源回收顺序错误导致跳过战斗时黑屏的问题
							
							
							
							
							
						 | 
						
							2020-11-17 21:40:36 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								77934cd274
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-17 20:39:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4eb60838b4
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复被动112参数错误
							
							
							
							
							
						 | 
						
							2020-11-17 20:39:28 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a109678fb4
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】 天赋图标显示赋值
							
							
							
							
							
						 | 
						
							2020-11-17 20:12:36 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								646e3e8061
								
							
								
							
						 | 
						
							
							
								
								【编队优化】轩辕宝镜增加一键
							
							
							
							
							
						 | 
						
							2020-11-17 20:01:13 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a68a068746
								
							
								
							
						 | 
						
							
							
								
								【编队优化】巅峰赛增加一键
							
							
							
							
							
						 | 
						
							2020-11-17 19:59:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								462484db66
								
							
								
							
						 | 
						
							
							
								
								【编队优化】竞技场防守编队增加一键
							
							
							
							
							
						 | 
						
							2020-11-17 19:57:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c8aa6b5971
								
							
								
							
						 | 
						
							
							
								
								【编队优化】公会副本增加一键
							
							
							
							
							
						 | 
						
							2020-11-17 19:54:02 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								188dc707a9
								
							
								
							
						 | 
						
							
							
								
								【编队优化】大闹天宫增加一键
							
							
							
							
							
						 | 
						
							2020-11-17 19:42:08 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								84a28f8a28
								
							
								
							
						 | 
						
							
							
								
								[战斗] 196 被动  添加类型判断
							
							
							
							
							
						 | 
						
							2020-11-17 18:44:31 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								be0195af18
								
							
								
							
						 | 
						
							
							
								
								【战斗】战斗表现添加射线类型特凶啊
							
							
							
							
							
						 | 
						
							2020-11-17 18:31:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								05076eb743
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-17 18:30:45 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d3a276cdca
								
							
								
							
						 | 
						
							
							
								
								【测试战斗】皮肤加入本地数据保存
							
							
							
							
							
						 | 
						
							2020-11-17 18:30:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								75c04b2c43
								
							
								
							
						 | 
						
							
							
								
								【编队优化】心魔试炼增加一键上阵
							
							
							
							
							
						 | 
						
							2020-11-17 17:41:06 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								233ff1b361
								
							
								
							
						 | 
						
							
							
								
								【编队优化】无尽副本增加一键
							
							
							
							
							
						 | 
						
							2020-11-17 17:12:52 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								3308ce4479
								
							
								
							
						 | 
						
							
							
								
								[战斗] 被动处理   舍身济世200 ,及伏虎罗汉特性被动添加额外技能屏蔽
							
							
							
							
							
						 | 
						
							2020-11-17 17:35:25 +09:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8980c6be4a
								
							
								
							
						 | 
						
							
							
								
								【英雄战力】 乘减算修改
							
							
							
							
							
						 | 
						
							2020-11-17 15:33:45 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bdf45413bc
								
							
								
							
						 | 
						
							
							
								
								【森罗幻境】敌将详情 敌将位置调整
							
							
							
							
							
							
							
							(cherry picked from commit 2dd30f9ca3) 
							
						 | 
						
							2020-11-17 14:56:42 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								6a515c2374
								
							
								
							
						 | 
						
							
							
								
								【战斗】优化战斗资源回收机制,修复跳过战斗时灵兽报错
							
							
							
							
							
						 | 
						
							2020-11-17 14:05:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8f3325ad5f
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复灵兽释放技能时跳过战斗,下次战斗会显示上次战斗的casting的问题
							
							
							
							
							
						 | 
						
							2020-11-17 14:04:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								13496de590
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-17 11:54:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								04f8571692
								
							
								
							
						 | 
						
							
							
								
								【天宫秘宝】领取宝箱积分后秘宝红点不刷新修复
							
							
							
							
							
						 | 
						
							2020-11-17 11:53:49 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cd332c80d0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-17 10:58:09 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cae41baf71
								
							
								
							
						 | 
						
							
							
								
								【图鉴】 升星点亮图鉴 调整献祭坛预设
							
							
							
							
							
						 | 
						
							2020-11-17 10:57:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								69d818118c
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】单抽十连奖励获得界面上方货币显示不正确修复
							
							
							
							
							
						 | 
						
							2020-11-17 10:56:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d433d2a690
								
							
								
							
						 | 
						
							
							
								
								【公告】打开公告前获取公告信息
							
							
							
							
							
						 | 
						
							2020-11-17 10:44:55 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								383f20aa32
								
							
								
							
						 | 
						
							
							
								
								【战斗】 被动266去除无用log
							
							
							
							
							
						 | 
						
							2020-11-17 10:02:29 +09:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2955a067fa
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 图鉴未开觉醒功能点进去报错修复提交
							
							
							
							
							
						 | 
						
							2020-11-16 21:00:23 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								58c538e41b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-16 18:34:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								46750846f8
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复灵兽技能释放后会检测轮数,导致战斗卡死的问题。
							
							
							
							
							
						 | 
						
							2020-11-16 18:34:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f384e25ad6
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】今日召唤上限次数不对修改
							
							
							
							
							
							
							
							(cherry picked from commit 38e625aba1eee93177e41293eb35668cb3b6c3a2)
(cherry picked from commit bef1181f19) 
							
						 | 
						
							2020-11-16 17:51:25 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8531323faa
								
							
								
							
						 | 
						
							
							
								
								推送礼包剔除过期的礼包
							
							
							
							
							
						 | 
						
							2020-11-16 17:30:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9601af33e7
								
							
								
							
						 | 
						
							
							
								
								【神将详情】排行榜查看他人装备显示出售按钮修复
							
							
							
							
							
						 | 
						
							2020-11-16 16:20:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8df6de20e5
								
							
								
							
						 | 
						
							
							
								
								【副本】isInMap字段删除bug修复
							
							
							
							
							
						 | 
						
							2020-11-16 15:24:09 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2000240f64
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 提示文字
							
							
							
							
							
						 | 
						
							2020-11-16 14:57:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5301a91738
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复被动270普通攻击也能触发的问题
							
							
							
							
							
						 | 
						
							2020-11-16 14:04:58 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8edf7dd781
								
							
								
							
						 | 
						
							
							
								
								【战斗】被动添加
							
							
							
							
							
							
							
							270:技能直接伤害[a]%转化为生命治疗自己 
							
						 | 
						
							2020-11-16 11:50:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3348d60c65
								
							
								
							
						 | 
						
							
							
								
								【觉醒】 图鉴属性取整
							
							
							
							
							
						 | 
						
							2020-11-16 10:27:41 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								1287453f10
								
							
								
							
						 | 
						
							
							
								
								【战斗】 额外技能添加5技能
							
							
							
							
							
						 | 
						
							2020-11-14 20:20:06 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								406cf2e1f7
								
							
								
							
						 | 
						
							
							
								
								【战斗】 被动265效果修改
							
							
							
							
							
						 | 
						
							2020-11-14 19:52:47 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b1549b470b
								
							
								
							
						 | 
						
							
							
								
								[战斗]  被动268修改
							
							
							
							
							
						 | 
						
							2020-11-14 19:20:55 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								af915fb480
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-14 17:37:42 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ede48e5063
								
							
								
							
						 | 
						
							
							
								
								【测试战斗】添加总伤害数值打印
							
							
							
							
							
						 | 
						
							2020-11-14 17:37:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e6ac0a8845
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-14 17:20:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b7269ccf89
								
							
								
							
						 | 
						
							
							
								
								【测试战斗】修复测试战斗按钮层级过高遮挡伤害数字的问题
							
							
							
							
							
						 | 
						
							2020-11-14 17:20:33 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d64ed5e92d
								
							
								
							
						 | 
						
							
							
								
								[战斗] 268 被动效果修改
							
							
							
							
							
						 | 
						
							2020-11-14 17:32:09 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5e0384b847
								
							
								
							
						 | 
						
							
							
								
								[战斗]免疫盾修改提交
							
							
							
							
							
						 | 
						
							2020-11-14 17:13:37 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								6821324fb1
								
							
								
							
						 | 
						
							
							
								
								[战斗]减伤盾效果修改提交
							
							
							
							
							
						 | 
						
							2020-11-14 15:43:40 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								deb8603b98
								
							
								
							
						 | 
						
							
							
								
								[战斗]减伤盾效果修改
							
							
							
							
							
						 | 
						
							2020-11-14 15:11:32 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4fd822a333
								
							
								
							
						 | 
						
							
							
								
								【战斗】删除战斗艺术字配置,改为即时判断
							
							
							
							
							
						 | 
						
							2020-11-13 19:44:55 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								142d8dee0f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-13 19:38:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								56afe786be
								
							
								
							
						 | 
						
							
							
								
								【战斗】战斗关闭时不再回收灵兽立绘资源,直接销毁,避免在UI上立绘不停播放攻击动作的问题
							
							
							
							
							
						 | 
						
							2020-11-13 19:38:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								1face65dbb
								
							
								
							
						 | 
						
							
							
								
								【战斗】免疫效果自定义类型添加,免疫效果文字显示恢复
							
							
							
							
							
						 | 
						
							2020-11-13 19:34:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9424037d9e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-13 18:58:47 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4a0a702fec
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】凤凰无限飞bug缓解
							
							
							
							
							
						 | 
						
							2020-11-13 18:58:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6c8a011528
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
							
							
							
							
							
						 | 
						
							2020-11-13 18:01:05 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								46eeceb79d
								
							
								
							
						 | 
						
							
							
								
								【主题活动】bug修复
							
							
							
							
							
						 | 
						
							2020-11-13 18:00:56 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								70e019f837
								
							
								
							
						 | 
						
							
							
								
								gm 测试战斗添加设置皮肤
							
							
							
							
							
						 | 
						
							2020-11-13 17:48:11 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								fee4501004
								
							
								
							
						 | 
						
							
							
								
								[战斗] 266被动修改
							
							
							
							
							
						 | 
						
							2020-11-13 18:42:27 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d6d5f5cdfa
								
							
								
							
						 | 
						
							
							
								
								257 561 267 技能修改
							
							
							
							
							
						 | 
						
							2020-11-13 17:38:35 +08:00 |