liujiaqi
							
						 | 
						
							
							
							
							
								
							
								a6a9575b98
								
							
								
							
						 | 
						
							
							
								
								1152技能描述
							
							
							
							
							
						 | 
						
							2020-07-28 21:12:39 +08:00 | 
						
					
				
					
						
							
							
								 
								wangyuan
							
						 | 
						
							
							
							
							
								
							
								9ca5a21a96
								
							
								
							
						 | 
						
							
							
								
								妖魂魔符换成幸运探宝券和置换玉换成九转金丹  所有道具对应价格表 配置成打折道具
							
							
							
							
							
						 | 
						
							2020-07-28 20:52:40 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								77a7c52ca1
								
							
								
							
						 | 
						
							
							
								
								修改活动持续时间
							
							
							
							
							
						 | 
						
							2020-07-28 20:27:17 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								6f1932faaa
								
							
								
							
						 | 
						
							
							
								
								修改道具描述
							
							
							
							
							
						 | 
						
							2020-07-28 20:24:49 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								30aed85812
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-28 20:09:49 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								42740e5e19
								
							
								
							
						 | 
						
							
							
								
								修改指引文字
							
							
							
							
							
						 | 
						
							2020-07-28 20:09:39 +08:00 | 
						
					
				
					
						
							
							
								 
								szxhzz
							
						 | 
						
							
							
							
							
								
							
								b0c0bf5da0
								
							
								
							
						 | 
						
							
							
								
								配置表更新
							
							
							
							
							
						 | 
						
							2020-07-28 19:08:28 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								05486c779b
								
							
								
							
						 | 
						
							
							
								
								修改帮助文字
							
							
							
							
							
						 | 
						
							2020-07-28 17:55:44 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								fff72e4047
								
							
								
							
						 | 
						
							
							
								
								修改图片
							
							
							
							
							
						 | 
						
							2020-07-28 17:53:50 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								4b9a9d27d2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	data_execl/base_data/ItemConfig.xlsx 
							
						 | 
						
							2020-07-28 17:50:18 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								2168db33a3
								
							
								
							
						 | 
						
							
							
								
								修改道具图片
							
							
							
							
							
						 | 
						
							2020-07-28 17:43:02 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								f9c686d56e
								
							
								
							
						 | 
						
							
							
								
								技能描述修改
							
							
							
							
							
						 | 
						
							2020-07-28 17:36:45 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								ce3d5f8eda
								
							
								
							
						 | 
						
							
							
								
								技能描述修改
							
							
							
							
							
						 | 
						
							2020-07-28 17:28:53 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								b1e011e049
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-28 17:07:22 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								1ff4c353a6
								
							
								
							
						 | 
						
							
							
								
								bug礼包和入群礼包
							
							
							
							
							
						 | 
						
							2020-07-28 17:06:54 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								4ea92473b9
								
							
								
							
						 | 
						
							
							
								
								bugfix
							
							
							
							
							
						 | 
						
							2020-07-28 17:06:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2a87d43fd0
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
							
						 | 
						
							2020-07-31 17:36:06 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								701faa8360
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-28 16:38:57 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								f48b05e535
								
							
								
							
						 | 
						
							
							
								
								修改特效配置,挂机对话,帮助文字
							
							
							
							
							
						 | 
						
							2020-07-28 16:38:49 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								29b60d30c4
								
							
								
							
						 | 
						
							
							
								
								修改大闹天空圣物掉落
							
							
							
							
							
						 | 
						
							2020-07-28 16:29:25 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								afc2fa5c86
								
							
								
							
						 | 
						
							
							
								
								修改道具图片
							
							
							
							
							
						 | 
						
							2020-07-28 15:48:23 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								9d5280d025
								
							
								
							
						 | 
						
							
							
								
								修改道具名称
							
							
							
							
							
						 | 
						
							2020-07-28 15:37:52 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								fa241a43b2
								
							
								
							
						 | 
						
							
							
								
								限时通关首个钻石改10连、竞技场寻宝微调
							
							
							
							
							
						 | 
						
							2020-07-28 15:26:00 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cec1f145b6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-28 09:48:26 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								48ac527f1a
								
							
								
							
						 | 
						
							
							
								
								限时召唤 乾坤宝盒 页面整合
							
							
							
							
							
						 | 
						
							2020-07-28 09:48:02 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								aff5c002a9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	data_execl/base_data/CombatControl.xlsx 
							
						 | 
						
							2020-07-27 21:04:51 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								66f2e2860d
								
							
								
							
						 | 
						
							
							
								
								修改特效及文字表
							
							
							
							
							
						 | 
						
							2020-07-27 20:05:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c25fc7e39d
								
							
								
							
						 | 
						
							
							
								
								bulletTime字段权限修改
							
							
							
							
							
						 | 
						
							2020-07-27 19:45:37 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								854c359043
								
							
								
							
						 | 
						
							
							
								
								献祭、归元、吃掉返还调整
							
							
							
							
							
						 | 
						
							2020-07-27 18:23:37 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								3f490c64b9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-27 18:13:06 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								5d08c6832a
								
							
								
							
						 | 
						
							
							
								
								修改受击特效
							
							
							
							
							
						 | 
						
							2020-07-27 18:09:38 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								178b3054b7
								
							
								
							
						 | 
						
							
							
								
								道具商城
							
							
							
							
							
						 | 
						
							2020-07-27 17:00:52 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								807d6745ac
								
							
								
							
						 | 
						
							
							
								
								描述调整
							
							
							
							
							
						 | 
						
							2020-07-27 16:17:02 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								974f5a1fd5
								
							
								
							
						 | 
						
							
							
								
								添加活动开启时间和描述
							
							
							
							
							
						 | 
						
							2020-07-27 15:54:02 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								57c748b960
								
							
								
							
						 | 
						
							
							
								
								修改挂机文字
							
							
							
							
							
						 | 
						
							2020-07-27 11:22:09 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								2fa696094a
								
							
								
							
						 | 
						
							
							
								
								修改竞技场引导战斗用机器人
							
							
							
							
							
						 | 
						
							2020-07-27 09:59:28 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								7692325864
								
							
								
							
						 | 
						
							
							
								
								修改图标
							
							
							
							
							
						 | 
						
							2020-07-25 23:07:54 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								ddd0aff41c
								
							
								
							
						 | 
						
							
							
								
								修改图片配置
							
							
							
							
							
						 | 
						
							2020-07-25 22:50:29 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								039e831582
								
							
								
							
						 | 
						
							
							
								
								修改图标
							
							
							
							
							
						 | 
						
							2020-07-25 20:47:20 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								9f5b75213e
								
							
								
							
						 | 
						
							
							
								
								修改特效配置
							
							
							
							
							
						 | 
						
							2020-07-25 20:39:20 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								3b26247c5d
								
							
								
							
						 | 
						
							
							
								
								修改图鉴图片
							
							
							
							
							
						 | 
						
							2020-07-25 19:47:49 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								8afcc5fdf4
								
							
								
							
						 | 
						
							
							
								
								修改图鉴图片
							
							
							
							
							
						 | 
						
							2020-07-25 19:43:31 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								fcdf21e2bd
								
							
								
							
						 | 
						
							
							
								
								修改立绘错误
							
							
							
							
							
						 | 
						
							2020-07-25 18:51:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5d6543caee
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-25 18:37:27 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0a35d31531
								
							
								
							
						 | 
						
							
							
								
								关闭星成长礼拍脸
							
							
							
							
							
						 | 
						
							2020-07-25 18:37:19 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								901442e847
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-25 18:34:38 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								b435345177
								
							
								
							
						 | 
						
							
							
								
								修改声效触发时机
							
							
							
							
							
						 | 
						
							2020-07-25 18:34:26 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								686ae9a826
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-25 18:07:35 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								b4577b9718
								
							
								
							
						 | 
						
							
							
								
								修改竞技场机器人库,使其匹配大闹天宫
							
							
							
							
							
						 | 
						
							2020-07-25 18:07:13 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								7028de188e
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
							
						 | 
						
							2020-07-25 18:02:58 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								71438e88c3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-25 17:39:34 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								8281ce1733
								
							
								
							
						 | 
						
							
							
								
								添加缺失效果
							
							
							
							
							
						 | 
						
							2020-07-25 17:38:52 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								671441d305
								
							
								
							
						 | 
						
							
							
								
								巅峰时间、充值屏蔽
							
							
							
							
							
						 | 
						
							2020-07-25 17:16:58 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a65257a740
								
							
								
							
						 | 
						
							
							
								
								剑影仙踪去掉拍脸
							
							
							
							
							
						 | 
						
							2020-09-11 21:37:17 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2b7eb6bf2a
								
							
								
							
						 | 
						
							
							
								
								Merge branch '英雄技能特效添加' into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/Effect/Prefab.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_bhxz_00013_t1_attack_01.prefab.meta
#	Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchGuessTipViewPopup.lua.meta 
							
						 | 
						
							2020-07-25 16:13:55 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								773448d96c
								
							
								
							
						 | 
						
							
							
								
								修改特效
							
							
							
							
							
						 | 
						
							2020-07-25 16:11:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1845d662ab
								
							
								
							
						 | 
						
							
							
								
								巅峰战竞猜结果新加界面    新手引导修改主线开始战斗按钮名称
							
							
							
							
							
						 | 
						
							2020-09-07 21:15:40 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								ab7e0c022d
								
							
								
							
						 | 
						
							
							
								
								test
							
							
							
							
							
						 | 
						
							2020-07-25 14:06:55 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								5623050a01
								
							
								
							
						 | 
						
							
							
								
								变强屏蔽充值跳转、屏蔽巅峰商店
							
							
							
							
							
						 | 
						
							2020-07-24 19:20:13 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								f6415aa772
								
							
								
							
						 | 
						
							
							
								
								修改巅峰赛规则
							
							
							
							
							
						 | 
						
							2020-08-05 23:19:28 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								05f0d11729
								
							
								
							
						 | 
						
							
							
								
								巅峰战战斗回合、充值留特权商城
							
							
							
							
							
						 | 
						
							2020-07-24 17:15:30 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								44b83f6fdd
								
							
								
							
						 | 
						
							
							
								
								修改圣物错误描述
							
							
							
							
							
						 | 
						
							2020-07-24 17:13:25 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								409874c052
								
							
								
							
						 | 
						
							
							
								
								限时折扣推送 18级 因屏蔽充值 改998
							
							
							
							
							
						 | 
						
							2020-07-24 16:15:43 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								cac0384012
								
							
								
							
						 | 
						
							
							
								
								屏充值
							
							
							
							
							
						 | 
						
							2020-07-24 16:04:31 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								1ffb97cf9f
								
							
								
							
						 | 
						
							
							
								
								巅峰赛开启时间
							
							
							
							
							
						 | 
						
							2020-07-24 15:16:44 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								bffd51518d
								
							
								
							
						 | 
						
							
							
								
								归元
							
							
							
							
							
						 | 
						
							2020-07-24 12:10:35 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								be095cbb7b
								
							
								
							
						 | 
						
							
							
								
								修改竞技场帮助文本
							
							
							
							
							
						 | 
						
							2020-07-24 11:19:16 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								a5e0f98bcd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-24 10:46:12 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								d4f48e575d
								
							
								
							
						 | 
						
							
							
								
								暂屏付费之2
							
							
							
							
							
						 | 
						
							2020-07-24 10:45:51 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								cbfc420a96
								
							
								
							
						 | 
						
							
							
								
								修改竞技场刷新时间为7天
							
							
							
							
							
						 | 
						
							2020-07-24 10:43:32 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								dc9fa4e880
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-24 10:08:06 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								7418fd2fa7
								
							
								
							
						 | 
						
							
							
								
								暂屏充值test
							
							
							
							
							
						 | 
						
							2020-07-24 10:06:54 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3fa23c25ea
								
							
								
							
						 | 
						
							
							
								
								修改界面id
							
							
							
							
							
						 | 
						
							2020-07-23 21:29:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3588a17c00
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into master_arena
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
#	data_execl/base_data/UIConfig.xlsx 
							
						 | 
						
							2020-07-23 21:24:00 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								d820ef152a
								
							
								
							
						 | 
						
							
							
								
								bugfix
							
							
							
							
							
						 | 
						
							2020-07-23 18:19:26 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								94684153c3
								
							
								
							
						 | 
						
							
							
								
								回放三局两胜显示
							
							
							
							
							
						 | 
						
							2020-07-23 18:06:55 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								de99aed8a5
								
							
								
							
						 | 
						
							
							
								
								充值表修改备注、献祭表id大小写、调整转盘奖励
							
							
							
							
							
						 | 
						
							2020-07-23 17:32:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7fb5ac778f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-23 15:44:51 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9b290c1ed5
								
							
								
							
						 | 
						
							
							
								
								图片资源替换
							
							
							
							
							
						 | 
						
							2020-07-23 15:44:40 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								4af617da49
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-23 15:43:23 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								a8c5d9b7d7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-23 15:29:11 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								9a58ce4eb1
								
							
								
							
						 | 
						
							
							
								
								修改提示文字
							
							
							
							
							
						 | 
						
							2020-07-23 15:29:04 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3b3dbec6a7
								
							
								
							
						 | 
						
							
							
								
								添加巅峰赛编队
							
							
							
							
							
						 | 
						
							2020-07-23 14:36:28 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								a681ca2cfc
								
							
								
							
						 | 
						
							
							
								
								增加怪物天赋的升级成长,修改怪物属性
							
							
							
							
							
						 | 
						
							2020-07-23 14:18:15 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								fbc49bbaae
								
							
								
							
						 | 
						
							
							
								
								送神
							
							
							
							
							
						 | 
						
							2020-07-23 13:54:46 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								7fdcd31685
								
							
								
							
						 | 
						
							
							
								
								提示文字修改
							
							
							
							
							
						 | 
						
							2020-07-23 13:46:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3cf3cf7e90
								
							
								
							
						 | 
						
							
							
								
								特效旋转功能添加
							
							
							
							
							
						 | 
						
							2020-07-23 13:44:03 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								c16a0d32d2
								
							
								
							
						 | 
						
							
							
								
								修改引导文字
							
							
							
							
							
						 | 
						
							2020-07-23 11:31:11 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								ac27c34d6e
								
							
								
							
						 | 
						
							
							
								
								修改十绝阵详情
							
							
							
							
							
						 | 
						
							2020-07-23 11:27:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								cafa630185
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into xuanyuanbaojing
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua 
							
						 | 
						
							2020-07-22 20:19:57 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								eb420274f6
								
							
								
							
						 | 
						
							
							
								
								大闹天宫困难模式开启战力、归元天宫编队提示
							
							
							
							
							
						 | 
						
							2020-07-22 19:11:07 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								c47500523a
								
							
								
							
						 | 
						
							
							
								
								修改日常副本文字描述
							
							
							
							
							
						 | 
						
							2020-07-22 15:29:10 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								508b6c284f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-22 14:53:14 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								56d356772b
								
							
								
							
						 | 
						
							
							
								
								修改推荐队伍角色名称
							
							
							
							
							
						 | 
						
							2020-07-22 14:53:06 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								560b366938
								
							
								
							
						 | 
						
							
							
								
								添加前置特效转向的效果
							
							
							
							
							
						 | 
						
							2020-07-22 14:49:32 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								5a6b495481
								
							
								
							
						 | 
						
							
							
								
								七日狂欢,6 7天奖励修改
							
							
							
							
							
						 | 
						
							2020-07-22 14:43:57 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								8b06b6dd95
								
							
								
							
						 | 
						
							
							
								
								标注修改部分
							
							
							
							
							
						 | 
						
							2020-07-22 11:12:25 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								804bca6284
								
							
								
							
						 | 
						
							
							
								
								添加宝物分解玩法规则
							
							
							
							
							
						 | 
						
							2020-07-22 10:51:38 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								c7bc3973e7
								
							
								
							
						 | 
						
							
							
								
								修改归元帮助文本
							
							
							
							
							
						 | 
						
							2020-07-22 10:46:55 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								abf8830744
								
							
								
							
						 | 
						
							
							
								
								前置特效添加全屏类型
							
							
							
							
							
						 | 
						
							2020-07-21 21:34:47 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								70c947b790
								
							
								
							
						 | 
						
							
							
								
								bugfix
							
							
							
							
							
						 | 
						
							2020-07-21 20:20:38 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								07964515d9
								
							
								
							
						 | 
						
							
							
								
								怪物展示等级调整、限时兑换活动时长
							
							
							
							
							
						 | 
						
							2020-07-21 17:36:06 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								b167354ff5
								
							
								
							
						 | 
						
							
							
								
								进阶提升属性修改
							
							
							
							
							
						 | 
						
							2020-07-21 17:00:01 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f420ee3bd7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into 英雄技能特效添加
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ab_lzhl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_axl_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_bah_dww01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_bxxz_lhzf01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_chdr_qsqy01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_cy_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dhc_dhjf01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dj_hmhx01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dlsm_hskj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dm_lrzj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dst_zxtsl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_dz_htjl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_eh_hslc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fhlh_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ft_csl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_fx_lrzs01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_gg_alky01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ghn_ysyn01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hdxj_llhl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hhe_swzh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hsmw_swzh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_hxps_xtcz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jcdp_dpzc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jgtn_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jhns_ylp01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jhxn_wxlz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jl_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jll_yjl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jls_jlsw01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jmm_myjm01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jw_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jy_jyh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_jzy_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lc_ssym01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ldb_qzjfl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ljgz_hllw01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ls_lshd01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lsx_swz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_lzz_fjlyl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mjn_lhj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mp_lqfc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mslz_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mw_mwz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mz_dzcx01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_mz_pxz01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_nxq_lyc01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ny_qmsg01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_qxn_yyw01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_rd_gftm01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sdxj_sbj01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sgb_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_sjll_bgxp01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_tljz_zxxzl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ts_jzlcl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_tyxj_tyyq01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_wg_wgfg01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_xllh_aa01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yc_ycmh01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ygl_yll01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ygps_ysqr01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_yj_fjcy01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_ylw_pgdm01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_zbj_tpywl01.mp3.meta
#	Assets/ManagedResources/Audio/Skill/actor_voc/Audio_battle_zz_zzm01.mp3.meta
#	data_execl/base_data/CombatControl.xlsx 
							
						 | 
						
							2020-07-21 14:48:51 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								a7494e7008
								
							
								
							
						 | 
						
							
							
								
								抽卡特权、超级月卡开启时间
							
							
							
							
							
						 | 
						
							2020-07-21 14:23:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								03107d240a
								
							
								
							
						 | 
						
							
							
								
								轩辕宝镜提交
							
							
							
							
							
						 | 
						
							2020-07-21 10:42:20 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9ed616d8be
								
							
								
							
						 | 
						
							
							
								
								
							
							
							
							
							
						 | 
						
							2020-07-21 09:38:34 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								7859285404
								
							
								
							
						 | 
						
							
							
								
								调整特效
							
							
							
							
							
						 | 
						
							2020-07-20 20:54:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9b7e47aaef
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' into xuanyuanbaojing
							
							
							
							
							
							
							
							# Conflicts:
#	data_execl/base_data/RaceTowerConfig.xlsx 
							
						 | 
						
							2020-07-20 20:00:31 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								b7aaa633c9
								
							
								
							
						 | 
						
							
							
								
								增加轩辕宝境缺少的功能字段
							
							
							
							
							
						 | 
						
							2020-07-20 19:57:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								04e9a24db0
								
							
								
							
						 | 
						
							
							
								
								xuanyuanmirror tijiao
							
							
							
							
							
						 | 
						
							2020-07-20 19:46:08 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								6b007ddcfb
								
							
								
							
						 | 
						
							
							
								
								巅峰战奖励调整
							
							
							
							
							
						 | 
						
							2020-07-20 17:45:04 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								89e7841b12
								
							
								
							
						 | 
						
							
							
								
								竞技场战斗阶段掉落内容
							
							
							
							
							
						 | 
						
							2020-07-20 17:16:09 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								458c4dd054
								
							
								
							
						 | 
						
							
							
								
								斗法排行奖励调整
							
							
							
							
							
						 | 
						
							2020-07-20 17:02:16 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								5f0b1ae349
								
							
								
							
						 | 
						
							
							
								
								月礼包新增礼包8,新增神将升星自选箱,开服狂欢3日7日奖励更改
							
							
							
							
							
						 | 
						
							2020-07-20 16:32:03 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								99f885ac22
								
							
								
							
						 | 
						
							
							
								
								竞技场宝箱奖励位置可配
							
							
							
							
							
						 | 
						
							2020-07-20 16:01:16 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								4b946aa324
								
							
								
							
						 | 
						
							
							
								
								音頻跟新
							
							
							
							
							
						 | 
						
							2020-07-20 15:52:33 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								b9042bc782
								
							
								
							
						 | 
						
							
							
								
								置换卡池、魂印商店调整
							
							
							
							
							
						 | 
						
							2020-07-20 15:38:46 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								7f61f6317c
								
							
								
							
						 | 
						
							
							
								
								嫦娥共工大小调整
							
							
							
							
							
						 | 
						
							2020-07-20 14:31:59 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								e10ec6728f
								
							
								
							
						 | 
						
							
							
								
								调整部分成就前置
							
							
							
							
							
						 | 
						
							2020-07-20 10:28:08 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								734feeadf4
								
							
								
							
						 | 
						
							
							
								
								修改部分文字描述
							
							
							
							
							
						 | 
						
							2020-07-17 21:39:48 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								994d90a086
								
							
								
							
						 | 
						
							
							
								
								修改商店bug
							
							
							
							
							
						 | 
						
							2020-07-17 21:21:22 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								b4ee8d9aea
								
							
								
							
						 | 
						
							
							
								
								首充5级
							
							
							
							
							
						 | 
						
							2020-07-17 21:04:09 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								640df86d5c
								
							
								
							
						 | 
						
							
							
								
								增加轩辕宝境相关表,修改关联表,功能开发用
							
							
							
							
							
						 | 
						
							2020-07-17 18:43:47 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								c817c03411
								
							
								
							
						 | 
						
							
							
								
								竞技场累计次数奖励
							
							
							
							
							
						 | 
						
							2020-07-17 18:35:17 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								f5dab0f98d
								
							
								
							
						 | 
						
							
							
								
								装备名修改
							
							
							
							
							
						 | 
						
							2020-07-17 18:19:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								3c6db51497
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-17 18:06:10 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								2264a3a298
								
							
								
							
						 | 
						
							
							
								
								分离宝囊和限时抽卡特权及计数
							
							
							
							
							
						 | 
						
							2020-07-17 18:02:26 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								6d07756f4b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-17 17:29:48 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								d4a1a2d5c5
								
							
								
							
						 | 
						
							
							
								
								修改配音配置
							
							
							
							
							
						 | 
						
							2020-07-17 17:29:41 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								47bb773f6e
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
							
						 | 
						
							2020-07-17 17:01:17 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								eb571c6ea9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-17 16:58:24 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								1b17159e96
								
							
								
							
						 | 
						
							
							
								
								删除错误配音及修改攻击音效
							
							
							
							
							
						 | 
						
							2020-07-17 16:58:16 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								752634e423
								
							
								
							
						 | 
						
							
							
								
								修改挂机奖励提示邮件文字
							
							
							
							
							
						 | 
						
							2020-07-17 16:52:11 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								b2ee40a04a
								
							
								
							
						 | 
						
							
							
								
								演示战斗更新
							
							
							
							
							
						 | 
						
							2020-07-17 16:16:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								c560b6acc0
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-17 16:15:28 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								44fde17a80
								
							
								
							
						 | 
						
							
							
								
								VIPbug
							
							
							
							
							
						 | 
						
							2020-07-17 15:56:27 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								7e72d741c9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-17 14:48:27 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								765e2350ab
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-17 14:47:10 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								b354c2b214
								
							
								
							
						 | 
						
							
							
								
								共工敌方大小,4星英雄技能
							
							
							
							
							
						 | 
						
							2020-07-17 14:46:01 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								e6bbfa659f
								
							
								
							
						 | 
						
							
							
								
								修改怪物属性,修改森罗幻境系统刷新时间
							
							
							
							
							
						 | 
						
							2020-07-17 12:13:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								817d80e77e
								
							
								
							
						 | 
						
							
							
								
								每日签到点击按钮出现时间调整
							
							
							
							
							
						 | 
						
							2020-07-17 10:09:25 +08:00 | 
						
					
				
					
						
							
							
								 
								szxhzz
							
						 | 
						
							
							
							
							
								
							
								531a21608b
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-16 20:53:40 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								67f4f4d5ee
								
							
								
							
						 | 
						
							
							
								
								东海寻仙关闭限时招募假战斗
							
							
							
							
							
						 | 
						
							2020-07-16 20:20:38 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								8a61b7b5a7
								
							
								
							
						 | 
						
							
							
								
								首充孙悟空假战斗
							
							
							
							
							
						 | 
						
							2020-07-16 20:10:41 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								dbb22677ca
								
							
								
							
						 | 
						
							
							
								
								修改特效配置
							
							
							
							
							
						 | 
						
							2020-07-16 19:58:20 +08:00 | 
						
					
				
					
						
							
							
								 
								szxhzz
							
						 | 
						
							
							
							
							
								
							
								dba04f95c9
								
							
								
							
						 | 
						
							
							
								
								AudioConfig更新
							
							
							
							
							
						 | 
						
							2020-07-16 19:36:19 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								2cab4e66c9
								
							
								
							
						 | 
						
							
							
								
								首充、关卡武将经验、限制等级
							
							
							
							
							
						 | 
						
							2020-07-16 17:47:32 +08:00 | 
						
					
				
					
						
							
							
								 
								szxhzz
							
						 | 
						
							
							
							
							
								
							
								d58d6c4ebe
								
							
								
							
						 | 
						
							
							
								
								AudioConfig更新
							
							
							
							
							
						 | 
						
							2020-07-16 17:28:43 +08:00 | 
						
					
				
					
						
							
							
								 
								szxhzz
							
						 | 
						
							
							
							
							
								
							
								79e7f41a60
								
							
								
							
						 | 
						
							
							
								
								AudioConfig更新
							
							
							
							
							
						 | 
						
							2020-07-16 17:19:31 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								d770d288eb
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-16 15:46:00 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								5a7cb2f84c
								
							
								
							
						 | 
						
							
							
								
								乾坤宝匙相关修改,jump表试炼副本改运营活动
							
							
							
							
							
						 | 
						
							2020-07-16 15:44:01 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								00a4234545
								
							
								
							
						 | 
						
							
							
								
								限时活动开启时间,关卡限制等级
							
							
							
							
							
						 | 
						
							2020-07-16 15:10:23 +08:00 | 
						
					
				
					
						
							
							
								 
								szxhzz
							
						 | 
						
							
							
							
							
								
							
								045e07cff0
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-16 14:41:07 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								0cc615cb27
								
							
								
							
						 | 
						
							
							
								
								321星英雄技能特效
							
							
							
							
							
						 | 
						
							2020-07-16 11:51:56 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								95a3be3363
								
							
								
							
						 | 
						
							
							
								
								修改全部怪物属性
							
							
							
							
							
						 | 
						
							2020-07-16 11:14:38 +08:00 | 
						
					
				
					
						
							
							
								 
								szxhzz
							
						 | 
						
							
							
							
							
								
							
								43f2a437a6
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-16 11:03:09 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								c8134ea18c
								
							
								
							
						 | 
						
							
							
								
								微调
							
							
							
							
							
						 | 
						
							2020-07-16 10:33:09 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								3d8efc8c95
								
							
								
							
						 | 
						
							
							
								
								紫色寻宝无法完成bug
							
							
							
							
							
						 | 
						
							2020-07-16 10:06:07 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								752cd999cc
								
							
								
							
						 | 
						
							
							
								
								添加英雄特效
							
							
							
							
							
						 | 
						
							2020-07-15 20:00:54 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								d00251dfd7
								
							
								
							
						 | 
						
							
							
								
								修改森罗幻境次元炸弹配置方法
							
							
							
							
							
						 | 
						
							2020-07-15 18:45:52 +08:00 | 
						
					
				
					
						
							
							
								 
								gongjiawei
							
						 | 
						
							
							
							
							
								
							
								f84d08ffeb
								
							
								
							
						 | 
						
							
							
								
								音频更新
							
							
							
							
							
						 | 
						
							2020-07-15 18:14:51 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								bca13d2d6f
								
							
								
							
						 | 
						
							
							
								
								增加献祭英雄和分解宝物时的单次数量限制
							
							
							
							
							
						 | 
						
							2020-07-15 17:26:45 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								9709e4abfb
								
							
								
							
						 | 
						
							
							
								
								首充英雄换孙悟空,跳过特权
							
							
							
							
							
						 | 
						
							2020-07-15 16:35:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e15bf9a7b2
								
							
								
							
						 | 
						
							
							
								
								轩辕宝镜资源提交
							
							
							
							
							
						 | 
						
							2020-07-15 16:27:58 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								ac8a07f482
								
							
								
							
						 | 
						
							
							
								
								老英雄名
							
							
							
							
							
						 | 
						
							2020-07-15 13:33:26 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								9eccc41a8c
								
							
								
							
						 | 
						
							
							
								
								调整宝物精炼消耗
							
							
							
							
							
						 | 
						
							2020-07-15 12:14:57 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								7f77abd772
								
							
								
							
						 | 
						
							
							
								
								跳过战斗特权
							
							
							
							
							
						 | 
						
							2020-07-15 11:43:28 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								a2ea55a33f
								
							
								
							
						 | 
						
							
							
								
								预览战斗修改
							
							
							
							
							
						 | 
						
							2020-07-14 20:01:24 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								931181e762
								
							
								
							
						 | 
						
							
							
								
								预览战斗修改,开服狂欢修改
							
							
							
							
							
						 | 
						
							2020-07-14 19:36:20 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								a302b02fe0
								
							
								
							
						 | 
						
							
							
								
								增加每日探宝次数上限
							
							
							
							
							
						 | 
						
							2020-07-14 17:11:03 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								0f97d3a592
								
							
								
							
						 | 
						
							
							
								
								修改归元返还比例
							
							
							
							
							
						 | 
						
							2020-07-14 15:47:00 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								8ae73c896f
								
							
								
							
						 | 
						
							
							
								
								修改宝器的开启等级
							
							
							
							
							
						 | 
						
							2020-07-14 15:33:22 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								0ee551e289
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
							
						 | 
						
							2020-07-14 14:14:23 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								65a82d10e2
								
							
								
							
						 | 
						
							
							
								
								归元
							
							
							
							
							
						 | 
						
							2020-07-14 10:15:25 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								6569de750f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-13 20:13:27 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								5b44b8fef5
								
							
								
							
						 | 
						
							
							
								
								4星武将技能名修改
							
							
							
							
							
						 | 
						
							2020-07-13 20:13:10 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								b31020ec5f
								
							
								
							
						 | 
						
							
							
								
								调整献祭进度条位置
							
							
							
							
							
						 | 
						
							2020-07-13 20:07:19 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								1562e97756
								
							
								
							
						 | 
						
							
							
								
								归元
							
							
							
							
							
						 | 
						
							2020-07-13 18:21:10 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								e717a4fa78
								
							
								
							
						 | 
						
							
							
								
								七天狂欢第三天登录奖励,乾坤抽魂印道具自愿修改
							
							
							
							
							
						 | 
						
							2020-07-13 18:02:50 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								09ca881967
								
							
								
							
						 | 
						
							
							
								
								修改配音配置
							
							
							
							
							
						 | 
						
							2020-07-13 17:49:24 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								adaa54830d
								
							
								
							
						 | 
						
							
							
								
								归元
							
							
							
							
							
						 | 
						
							2020-07-13 17:24:30 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								11add2dd81
								
							
								
							
						 | 
						
							
							
								
								乾坤魂印兑换图标资源
							
							
							
							
							
						 | 
						
							2020-07-13 16:52:16 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								4678a7e6ed
								
							
								
							
						 | 
						
							
							
								
								vipbugfix
							
							
							
							
							
						 | 
						
							2020-07-13 16:40:59 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								f21a74ba75
								
							
								
							
						 | 
						
							
							
								
								归元、精炼宝物消耗
							
							
							
							
							
						 | 
						
							2020-07-13 16:06:06 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								1e50ce286d
								
							
								
							
						 | 
						
							
							
								
								技能生效范围和七日登录描述
							
							
							
							
							
						 | 
						
							2020-07-13 15:28:17 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								1e2d9e646e
								
							
								
							
						 | 
						
							
							
								
								修改森罗幻境buff随机库
							
							
							
							
							
						 | 
						
							2020-07-13 15:20:19 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								af24467d74
								
							
								
							
						 | 
						
							
							
								
								转盘积分箱内容丢失bugfix
							
							
							
							
							
						 | 
						
							2020-07-13 11:45:24 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								053e8f6daa
								
							
								
							
						 | 
						
							
							
								
								调整通关奖励
							
							
							
							
							
						 | 
						
							2020-07-13 10:47:08 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								58cc4bc0c3
								
							
								
							
						 | 
						
							
							
								
								部分字段改为前后端读取
							
							
							
							
							
						 | 
						
							2020-07-11 18:04:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8d25e6f9b2
								
							
								
							
						 | 
						
							
							
								
								修复VIP引导报错
							
							
							
							
							
						 | 
						
							2020-07-11 18:03:27 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								c43233121f
								
							
								
							
						 | 
						
							
							
								
								修改传记文字
							
							
							
							
							
						 | 
						
							2020-07-11 17:17:13 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								45d89d395b
								
							
								
							
						 | 
						
							
							
								
								修改技能配置
							
							
							
							
							
						 | 
						
							2020-07-11 16:49:07 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								5686fb219d
								
							
								
							
						 | 
						
							
							
								
								增加配音配置
							
							
							
							
							
						 | 
						
							2020-07-11 16:26:03 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								27f46f4572
								
							
								
							
						 | 
						
							
							
								
								添加技能音效列
							
							
							
							
							
						 | 
						
							2020-07-11 15:22:03 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								c2370f561d
								
							
								
							
						 | 
						
							
							
								
								保底次数限时
							
							
							
							
							
						 | 
						
							2020-07-10 18:02:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0a5212d265
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-10 17:55:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b89c0582c0
								
							
								
							
						 | 
						
							
							
								
								宝囊
							
							
							
							
							
						 | 
						
							2020-07-10 17:55:11 +08:00 | 
						
					
				
					
						
							
							
								 
								altair
							
						 | 
						
							
							
							
							
								
							
								be89bc0c42
								
							
								
							
						 | 
						
							
							
								
								修改引导内容
							
							
							
							
							
						 | 
						
							2020-07-10 17:48:24 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								d02a3adee8
								
							
								
							
						 | 
						
							
							
								
								法宝资源部分替换
							
							
							
							
							
						 | 
						
							2020-07-10 16:33:26 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								b23f6fc806
								
							
								
							
						 | 
						
							
							
								
								乾坤宝囊分别红橙计数
							
							
							
							
							
						 | 
						
							2020-07-10 15:35:57 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								81a5da6cfc
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-10 15:06:40 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								fb91f85cab
								
							
								
							
						 | 
						
							
							
								
								修改8日奖励描述和奖励
							
							
							
							
							
						 | 
						
							2020-07-10 15:06:26 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								1e9c838e34
								
							
								
							
						 | 
						
							
							
								
								英雄命中
							
							
							
							
							
						 | 
						
							2020-07-10 14:08:12 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								603c9803de
								
							
								
							
						 | 
						
							
							
								
								下调VIP1、2升级难度
							
							
							
							
							
						 | 
						
							2020-07-10 11:45:01 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								b6e3410145
								
							
								
							
						 | 
						
							
							
								
								点金描述bug
							
							
							
							
							
						 | 
						
							2020-07-10 10:51:00 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								220da97000
								
							
								
							
						 | 
						
							
							
								
								bug狂欢普通抽
							
							
							
							
							
						 | 
						
							2020-07-10 10:35:36 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								99c11f8305
								
							
								
							
						 | 
						
							
							
								
								英雄阵营备注修改
							
							
							
							
							
						 | 
						
							2020-07-10 10:24:37 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								b449f521e6
								
							
								
							
						 | 
						
							
							
								
								另一个云游商店
							
							
							
							
							
						 | 
						
							2020-07-10 10:18:25 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								3e749c1862
								
							
								
							
						 | 
						
							
							
								
								bug
							
							
							
							
							
						 | 
						
							2020-07-10 09:53:20 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								78fca78236
								
							
								
							
						 | 
						
							
							
								
								bugfix
							
							
							
							
							
						 | 
						
							2020-07-09 20:31:18 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								d56cefc732
								
							
								
							
						 | 
						
							
							
								
								乾坤商店匹配活动
							
							
							
							
							
						 | 
						
							2020-07-09 17:24:30 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								339550d9e7
								
							
								
							
						 | 
						
							
							
								
								幻境杀怪掉落修改之2
							
							
							
							
							
						 | 
						
							2020-07-09 16:58:25 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								7185629090
								
							
								
							
						 | 
						
							
							
								
								修改森罗幻境怪物属性
							
							
							
							
							
						 | 
						
							2020-07-09 16:10:31 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								9383c02d40
								
							
								
							
						 | 
						
							
							
								
								幻境杀怪掉落初调
							
							
							
							
							
						 | 
						
							2020-07-09 15:58:07 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								55155cc2c3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-09 15:17:45 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								cca639cfba
								
							
								
							
						 | 
						
							
							
								
								修改森罗幻境商店错误
							
							
							
							
							
						 | 
						
							2020-07-09 15:15:19 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								83d578fbee
								
							
								
							
						 | 
						
							
							
								
								橙色4星装备名描述修改
							
							
							
							
							
						 | 
						
							2020-07-09 15:15:13 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								ac28494c82
								
							
								
							
						 | 
						
							
							
								
								保底优化
							
							
							
							
							
						 | 
						
							2020-07-09 15:02:35 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								2e22a79119
								
							
								
							
						 | 
						
							
							
								
								怪物命中率修改
							
							
							
							
							
						 | 
						
							2020-07-09 15:00:32 +08:00 | 
						
					
				
					
						
							
							
								 
								skuld
							
						 | 
						
							
							
							
							
								
							
								77c2b75175
								
							
								
							
						 | 
						
							
							
								
								修改每日召唤上限
							
							
							
							
							
						 | 
						
							2020-07-09 14:51:16 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								047721e3a4
								
							
								
							
						 | 
						
							
							
								
								修复bug
							
							
							
							
							
						 | 
						
							2020-07-09 14:12:39 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								790c38edeb
								
							
								
							
						 | 
						
							
							
								
								英雄初始命中修改
							
							
							
							
							
						 | 
						
							2020-07-09 11:36:57 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								f6421e9533
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-09 10:54:09 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								6614cf3e70
								
							
								
							
						 | 
						
							
							
								
								乾坤宝囊up展示
							
							
							
							
							
						 | 
						
							2020-07-09 10:52:51 +08:00 | 
						
					
				
					
						
							
							
								 
								kansa
							
						 | 
						
							
							
							
							
								
							
								3bd5576d98
								
							
								
							
						 | 
						
							
							
								
								删除怪物闪避和命中初始属性值
							
							
							
							
							
						 | 
						
							2020-07-09 10:52:42 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								ccfb9132f3
								
							
								
							
						 | 
						
							
							
								
								去掉云游商店,增加乾坤商店
							
							
							
							
							
						 | 
						
							2020-07-09 10:45:37 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								7a22636e66
								
							
								
							
						 | 
						
							
							
								
								角色闪避命中率修改
							
							
							
							
							
						 | 
						
							2020-07-08 21:05:26 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								ad03163b36
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-08 20:30:01 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								9e4df66051
								
							
								
							
						 | 
						
							
							
								
								表提交
							
							
							
							
							
						 | 
						
							2020-07-08 20:18:24 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								b27725bd4a
								
							
								
							
						 | 
						
							
							
								
								红色装备获取跳转修改
							
							
							
							
							
						 | 
						
							2020-07-08 20:11:35 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ce13a0263e
								
							
								
							
						 | 
						
							
							
								
								Merge branch '战斗优化v_n.0' into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	.gitignore
#	Assets/ManagedResources/Atlas/QianKunBox.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack01.prefab.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Config/Data/CombatControl.lua
#	Assets/ManagedResources/~Lua/Config/Data/SkillLogicConfig.lua
#	Assets/StreamingAssets/Android.meta 
							
						 | 
						
							2020-07-08 19:55:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								da6bb67d50
								
							
								
							
						 | 
						
							
							
								
								技能配置优化
							
							
							
							
							
						 | 
						
							2020-07-08 18:23:12 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								7b43f59192
								
							
								
							
						 | 
						
							
							
								
								乾坤宝囊
							
							
							
							
							
						 | 
						
							2020-07-08 16:55:28 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								ab2689b4de
								
							
								
							
						 | 
						
							
							
								
								修复武将升级返还资源bug、新增乾坤宝囊各种道具、修复限时抽将保底bug、修复寻宝刷出6个1星任务时异常的bug
							
							
							
							
							
						 | 
						
							2020-07-08 15:35:58 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								09270d8f85
								
							
								
							
						 | 
						
							
							
								
								限时招募累计奖励召唤次数修改
							
							
							
							
							
						 | 
						
							2020-07-08 14:46:33 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								46850f0dd4
								
							
								
							
						 | 
						
							
							
								
								乾坤宝囊问号
							
							
							
							
							
						 | 
						
							2020-07-08 11:14:36 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b999786cbb
								
							
								
							
						 | 
						
							
							
								
								部分技能配置
							
							
							
							
							
						 | 
						
							2020-07-08 10:34:41 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								e5d8e83c7f
								
							
								
							
						 | 
						
							
							
								
								修复bug调整部分概率
							
							
							
							
							
						 | 
						
							2020-07-08 10:10:17 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								210114f62f
								
							
								
							
						 | 
						
							
							
								
								技能配置添加
							
							
							
							
							
						 | 
						
							2020-07-07 15:59:17 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0a824f56ee
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-07-07 15:21:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bff7df21e4
								
							
								
							
						 | 
						
							
							
								
								装备出售界面添加
							
							
							
							
							
						 | 
						
							2020-07-07 15:20:43 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								49a132852a
								
							
								
							
						 | 
						
							
							
								
								抽卡次数修正,装备叠加数量修改
							
							
							
							
							
						 | 
						
							2020-07-07 15:12:20 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								96d5d080d5
								
							
								
							
						 | 
						
							
							
								
								超值基金2期bug、公会人数调整
							
							
							
							
							
						 | 
						
							2020-07-06 19:58:55 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								c9668c674c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into master_develop
							
							
							
							
							
							
							
							# Conflicts:
#	.gitignore 
							
						 | 
						
							2020-07-06 17:57:51 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								6cee0b79fe
								
							
								
							
						 | 
						
							
							
								
								xunbaobug
							
							
							
							
							
						 | 
						
							2020-07-06 17:50:27 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								d6e292caa6
								
							
								
							
						 | 
						
							
							
								
								Revert "tiangongtanbaobug"
							
							
							
							
							
							
							
							This reverts commit d76752e426. 
							
						 | 
						
							2020-07-06 17:48:29 +08:00 | 
						
					
				
					
						
							
							
								 
								shihongyi
							
						 | 
						
							
							
							
							
								
							
								d76752e426
								
							
								
							
						 | 
						
							
							
								
								tiangongtanbaobug
							
							
							
							
							
						 | 
						
							2020-07-06 17:47:25 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								385a8c86a1
								
							
								
							
						 | 
						
							
							
								
								bug  新手引导福利位置偏
							
							
							
							
							
						 | 
						
							2020-07-04 15:26:36 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0bdb498338
								
							
								
							
						 | 
						
							
							
								
								添加全屏弹道按列区分释放位移
							
							
							
							
							
						 | 
						
							2020-07-03 16:50:14 +08:00 |