|  ZhangBiao | dea2d14d3f | 乾坤宝盒时间修复 | 2020-07-28 22:00:11 +08:00 | 
				
					
						|  wangyuan | eff314bf31 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 21:42:19 +08:00 | 
				
					
						|  wangyuan | 7c7fabc3d0 | 修改商店物品价格 | 2020-07-28 21:35:26 +08:00 | 
				
					
						|  ZhangBiao | 609317ac25 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 21:18:59 +08:00 | 
				
					
						|  ZhangBiao | fb5d81a7a4 | bug修复 | 2020-07-28 21:18:40 +08:00 | 
				
					
						|  wangyuan | b2c515de97 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 21:15:31 +08:00 | 
				
					
						|  liujiaqi | a6a9575b98 | 1152技能描述 | 2020-07-28 21:12:39 +08:00 | 
				
					
						|  jiaoyangna | 0a73f284ef | carbon detail update | 2020-07-28 20:58:28 +08:00 | 
				
					
						|  wangyuan | 9ca5a21a96 | 妖魂魔符换成幸运探宝券和置换玉换成九转金丹  所有道具对应价格表 配置成打折道具 | 2020-07-28 20:52:40 +08:00 | 
				
					
						|  jiaoyangna | 5d70187da8 | 副本修改提交 | 2020-07-28 20:51:28 +08:00 | 
				
					
						|  kansa | 77a7c52ca1 | 修改活动持续时间 | 2020-07-28 20:27:17 +08:00 | 
				
					
						|  altair | 6f1932faaa | 修改道具描述 | 2020-07-28 20:24:49 +08:00 | 
				
					
						|  ZhangBiao | ecfe1f5e33 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 20:14:40 +08:00 | 
				
					
						|  ZhangBiao | 8c7b24ad9a | bug修复 | 2020-07-28 20:13:09 +08:00 | 
				
					
						|  altair | 95df60b0fe | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 20:10:15 +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 | 
				
					
						|  jiaoyangna | 5df246c45b | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 20:09:46 +08:00 | 
				
					
						|  jiaoyangna | 43ee7dd577 | 限时召唤提交 | 2020-07-28 20:09:41 +08:00 | 
				
					
						|  altair | 42740e5e19 | 修改指引文字 | 2020-07-28 20:09:39 +08:00 | 
				
					
						|  gongjiawei | 31826a5d08 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 19:45:06 +08:00 | 
				
					
						|  gongjiawei | b9c15c6c23 | 音频更新 | 2020-07-28 19:44:57 +08:00 | 
				
					
						|  szxhzz | 96fe229ade | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 19:44:15 +08:00 | 
				
					
						|  szxhzz | 3814874c3f | 音频更新 | 2020-07-28 19:43:35 +08:00 | 
				
					
						|  gongjiawei | b9f6ef86e7 | 音频更新 | 2020-07-28 19:39:27 +08:00 | 
				
					
						|  gongjiawei | efbfff0b3e | 音頻跟新 | 2020-07-28 19:35:51 +08:00 | 
				
					
						|  szxhzz | c879b10480 | 音频更新 | 2020-07-28 19:31:04 +08:00 | 
				
					
						|  jiaoyangna | a3298ae117 | 星星预设提交 | 2020-07-28 19:21:16 +08:00 | 
				
					
						|  jiaoyangna | a30e9e1757 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 19:18:50 +08:00 | 
				
					
						|  jiaoyangna | 8a2a443168 | 星星提交 | 2020-07-28 19:18:45 +08:00 | 
				
					
						|  szxhzz | b0c0bf5da0 | 配置表更新 | 2020-07-28 19:08:28 +08:00 | 
				
					
						|  jiaoyangna | bf77931b88 | 边框修改提交 | 2020-07-28 18:38:19 +08:00 | 
				
					
						|  altair | a6b232757c | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 18:22:19 +08:00 | 
				
					
						|  altair | 2e046d4d74 | 修改特效 | 2020-07-28 18:22:11 +08:00 | 
				
					
						|  gaoxin | e3e317fb5c | 音频压缩、加载格式修改 | 2020-07-28 18:01:53 +08:00 | 
				
					
						|  Genkins | 7649e67049 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 17:58:39 +08:00 | 
				
					
						|  Genkins | 65252cb36d | 添加图片优化工具 | 2020-07-28 17:57:02 +08:00 | 
				
					
						|  altair | 05486c779b | 修改帮助文字 | 2020-07-28 17:55:44 +08:00 | 
				
					
						|  altair | fff72e4047 | 修改图片 | 2020-07-28 17:53:50 +08:00 | 
				
					
						|  altair | f9b8b938ff | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 17:50:23 +08:00 | 
				
					
						|  zhangqiang | acba506782 | 寻宝添加6星显示 | 2020-07-31 18:40:22 +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 | 68b9b28901 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 17:37:01 +08:00 | 
				
					
						|  liujiaqi | f9c686d56e | 技能描述修改 | 2020-07-28 17:36:45 +08:00 | 
				
					
						|  gaoxin | 0922b8f587 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 17:31:24 +08:00 | 
				
					
						|  gaoxin | a603520fdb | Merge branch '接入SDK' into master_develop | 2020-07-28 17:30:59 +08:00 | 
				
					
						|  gaoxin | c9b4e71ab7 | 新aar资源替换 | 2020-07-28 17:30:06 +08:00 | 
				
					
						|  liujiaqi | ce3d5f8eda | 技能描述修改 | 2020-07-28 17:28:53 +08:00 | 
				
					
						|  ZhangBiao | 88effd78f1 | Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop | 2020-07-28 17:26:50 +08:00 | 
				
					
						|  ZhangBiao | 6c316bf7de |  | 2020-07-28 17:25:50 +08:00 |