wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								03b2acbb91
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/玉虚论道
							
							
							
							
							
							
							
							Conflicts:
	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2021-09-07 18:45:25 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								c531b3776b
								
							
								
							
						 | 
						
							
							
								
								玉虚论道提交
							
							
							
							
							
						 | 
						
							2021-09-07 18:27:23 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2fa2fe0a28
								
							
								
							
						 | 
						
							
							
								
								【织女】live2d资源没有透明通道
							
							
							
							
							
						 | 
						
							2021-09-07 18:26:43 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8c95c7f8ad
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】主界面基本完成
							
							
							
							
							
						 | 
						
							2021-09-07 18:09:33 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangshanxue
							
						 | 
						
							
							
							
							
								
							
								e4f65ba04b
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/test' into china/xq
							
							
							
							
							
						 | 
						
							2021-09-07 18:07:31 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e04cb9cdb8
								
							
								
							
						 | 
						
							
							
								
								【热更新】修改热更新配置文件
							
							
							
							
							
						 | 
						
							2021-09-07 18:05:30 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								17db509837
								
							
								
							
						 | 
						
							
							
								
								【热更新】修改热更新配置文件
							
							
							
							
							
						 | 
						
							2021-09-07 18:02:40 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								5f0bfe53bd
								
							
								
							
						 | 
						
							
							
								
								玉虚论道提交
							
							
							
							
							
						 | 
						
							2021-09-07 17:05:46 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								8b57b7df1f
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】西贺牛州选定区域优化
							
							
							
							
							
						 | 
						
							2021-09-07 15:42:05 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0bd0137a2b
								
							
								
							
						 | 
						
							
							
								
								【战斗】v1.0.57
							
							
							
							
							
							
							
							1、尝试修复孙悟空大招不会增加伤害的问题
 2、添加用于debug的log 
							
						 | 
						
							2021-09-07 15:14:10 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								79832f3232
								
							
								
							
						 | 
						
							
							
								
								【碎片详情】碎片详情添加灵兽和神将的查看
							
							
							
							
							
						 | 
						
							2021-09-07 11:40:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								19e83da85c
								
							
								
							
						 | 
						
							
							
								
								【资源】资源名重复
							
							
							
							
							
						 | 
						
							2021-09-07 10:27:34 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b74d5ebf38
								
							
								
							
						 | 
						
							
							
								
								【资源】资源名重复
							
							
							
							
							
						 | 
						
							2021-09-07 10:27:09 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangshanxue
							
						 | 
						
							
							
							
							
								
							
								c3dd7b40c4
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/test' into china/xq
							
							
							
							
							
						 | 
						
							2021-09-06 19:24:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0febc6ae6a
								
							
								
							
						 | 
						
							
							
								
								【背包】修复滑动后切换页签不回到最顶部的 问题
							
							
							
							
							
						 | 
						
							2021-09-06 19:23:56 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b5ad62620f
								
							
								
							
						 | 
						
							
							
								
								【背包】修复滑动后切换页签不回到最顶部的 问题
							
							
							
							
							
						 | 
						
							2021-09-06 19:23:41 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								466bee75bd
								
							
								
							
						 | 
						
							
							
								
								四灵排行榜类型修改
							
							
							
							
							
						 | 
						
							2021-09-06 19:10:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								17ebbc1872
								
							
								
							
						 | 
						
							
							
								
								【优化】灵兽商城商品上显示当前已有的灵兽碎片
							
							
							
							
							
						 | 
						
							2021-09-06 18:19:45 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b953fac2a0
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛】选拔赛组界面添加角色信息展示
							
							
							
							
							
						 | 
						
							2021-09-06 17:58:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6078ae545a
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-06 17:21:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangshanxue
							
						 | 
						
							
							
							
							
								
							
								053650b3e7
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/test' into china/xq
							
							
							
							
							
						 | 
						
							2021-09-06 16:36:25 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								34b09a565e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/test
							
							
							
							
							
						 | 
						
							2021-09-06 16:36:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								59ec0d6f20
								
							
								
							
						 | 
						
							
							
								
								【觉醒】修复会自动选择鸿蒙阵共鸣神将的问题
							
							
							
							
							
						 | 
						
							2021-09-06 16:35:46 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangshanxue
							
						 | 
						
							
							
							
							
								
							
								8c277426e5
								
							
								
							
						 | 
						
							
							
								
								【奖励】修复关闭界面时部分数据未还原
							
							
							
							
							
						 | 
						
							2021-09-06 13:55:12 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangshanxue
							
						 | 
						
							
							
							
							
								
							
								54cae546af
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/test' into china/xq
							
							
							
							
							
						 | 
						
							2021-09-06 11:47:33 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								6f08fe74b2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/test
							
							
							
							
							
						 | 
						
							2021-09-06 11:46:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								11495d1076
								
							
								
							
						 | 
						
							
							
								
								【山河社稷图】修复奖励界面报错导致卡死
							
							
							
							
							
						 | 
						
							2021-09-06 11:45:30 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d3ee7eda1d
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】资源提交
							
							
							
							
							
						 | 
						
							2021-09-06 11:42:32 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2d7ba67846
								
							
								
							
						 | 
						
							
							
								
								【七界试炼】提交
							
							
							
							
							
						 | 
						
							2021-09-06 11:37:49 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d564f0cf11
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/玉虚论道' into 0功能/七界试炼
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua 
							
						 | 
						
							2021-09-06 11:16:40 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a471905a9f
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/七界试炼
							
							
							
							
							
						 | 
						
							2021-09-06 11:13:15 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangshanxue
							
						 | 
						
							
							
							
							
								
							
								ddab583582
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/xq
							
							
							
							
							
						 | 
						
							2021-09-06 11:02:57 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								65dfb661ad
								
							
								
							
						 | 
						
							
							
								
								【version】修复设置version文件失败的问题
							
							
							
							
							
						 | 
						
							2021-09-06 11:02:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								17001dd7d8
								
							
								
							
						 | 
						
							
							
								
								【防沉迷】游戏内添加未成年人判断
							
							
							
							
							
						 | 
						
							2021-09-06 11:00:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								129c5d67d1
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/silingshilian' into china/xq
							
							
							
							
							
						 | 
						
							2021-09-03 18:57:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5af2fc261d
								
							
								
							
						 | 
						
							
							
								
								心魔修改提交
							
							
							
							
							
						 | 
						
							2021-09-03 18:56:46 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangshanxue
							
						 | 
						
							
							
							
							
								
							
								337000c21f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/0功能/silingshilian' into china/xq
							
							
							
							
							
						 | 
						
							2021-09-03 18:45:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								17f6cb8ff1
								
							
								
							
						 | 
						
							
							
								
								报错修改
							
							
							
							
							
						 | 
						
							2021-09-03 18:43:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1b82990227
								
							
								
							
						 | 
						
							
							
								
								【ID1018356】
							
							
							
							
							
							
							
							【四灵试炼】在线过渡第二天,新开启的试炼入口没红点,关闭的入口红点不消失 
							
						 | 
						
							2021-09-03 16:29:30 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangshanxue
							
						 | 
						
							
							
							
							
								
							
								4d98bd0081
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/0功能/silingshilian' into china/xq
							
							
							
							
							
						 | 
						
							2021-09-03 16:12:28 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangshanxue
							
						 | 
						
							
							
							
							
								
							
								39fc099fe6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into china/xq
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset 
							
						 | 
						
							2021-09-03 16:01:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								7d8bb2bc36
								
							
								
							
						 | 
						
							
							
								
								【Version工具】修改配置文件走svn
							
							
							
							
							
						 | 
						
							2021-09-03 15:54:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fb4a7afdc0
								
							
								
							
						 | 
						
							
							
								
								【ID1018360】
							
							
							
							
							
							
							
							【四灵试炼】助战入口显示红点,里面没可操作的神将 
							
						 | 
						
							2021-09-03 15:27:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5ffd4eab51
								
							
								
							
						 | 
						
							
							
								
								跑马灯修改提交
							
							
							
							
							
						 | 
						
							2021-09-03 15:14:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1fbfcb13ce
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-03 15:10:47 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								21d6b01106
								
							
								
							
						 | 
						
							
							
								
								【修行】元婴期突破空白文字修改
							
							
							
							
							
						 | 
						
							2021-09-03 15:10:38 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b7151b0354
								
							
								
							
						 | 
						
							
							
								
								【version】先遣测试服登录服修改
							
							
							
							
							
						 | 
						
							2021-09-03 14:07:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								68791a5745
								
							
								
							
						 | 
						
							
							
								
								【战力】连续打开变负数修改
							
							
							
							
							
						 | 
						
							2021-09-03 11:10:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								009a17a25a
								
							
								
							
						 | 
						
							
							
								
								【战力】漏提交
							
							
							
							
							
						 | 
						
							2021-09-03 10:19:51 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								688da4bcb0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-09-03 09:52:08 +08:00 |