gaoxin
							
						 | 
						
							
							
							
							
								
							
								8e677abe4e
								
							
								
							
						 | 
						
							
							
								
								【本地化】GM界面不再翻译
							
							
							
							
							
						 | 
						
							2021-04-09 18:20:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e55e8b51ee
								
							
								
							
						 | 
						
							
							
								
								【本地化】越南vip资源提交
							
							
							
							
							
						 | 
						
							2021-04-09 18:19:42 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0cc7de1597
								
							
								
							
						 | 
						
							
							
								
								【本地化工具】添加不导出文件配置,gm界面不再导出翻译
							
							
							
							
							
						 | 
						
							2021-04-09 18:02:32 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								26fda17758
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
							
							
							
							
							
						 | 
						
							2021-04-09 17:38:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ea5648839c
								
							
								
							
						 | 
						
							
							
								
								【配置文件】添加对游戏语音,健康提示显示的配置
							
							
							
							
							
						 | 
						
							2021-04-09 17:38:18 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e0449a4e47
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
							
							
							
							
							
						 | 
						
							2021-04-09 17:13:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a53f876a2f
								
							
								
							
						 | 
						
							
							
								
								【青龙秘宝】文字跳帧
							
							
							
							
							
						 | 
						
							2021-04-09 17:13:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								82794896a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
							
							
							
							
							
						 | 
						
							2021-04-09 16:56:11 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8d2bdf6228
								
							
								
							
						 | 
						
							
							
								
								限时神装 皮肤预览修改提交
							
							
							
							
							
						 | 
						
							2021-04-09 16:56:07 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3827aa3a15
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
							
							
							
							
							
						 | 
						
							2021-04-09 16:53:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5814ca39db
								
							
								
							
						 | 
						
							
							
								
								【青龙秘宝】文字超框修改
							
							
							
							
							
						 | 
						
							2021-04-09 16:51:49 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bfa2f1300f
								
							
								
							
						 | 
						
							
							
								
								【天宫寻宝】帮助按钮位置移动
							
							
							
							
							
						 | 
						
							2021-04-09 16:49:02 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								495f588c2e
								
							
								
							
						 | 
						
							
							
								
								【logo】还原Logo
							
							
							
							
							
						 | 
						
							2021-04-09 16:35:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c82b907b54
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
							
							
							
							
							
						 | 
						
							2021-04-09 16:20:30 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								acca43f54c
								
							
								
							
						 | 
						
							
							
								
								菩提树神图片提交
							
							
							
							
							
						 | 
						
							2021-04-09 16:20:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								196dfa34dd
								
							
								
							
						 | 
						
							
							
								
								【GM】添加红点数据查看工具
							
							
							
							
							
						 | 
						
							2021-04-09 16:14:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3418b63e02
								
							
								
							
						 | 
						
							
							
								
								【本地化】天宫寻宝文字关闭
							
							
							
							
							
						 | 
						
							2021-04-09 16:04:21 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ce0a6a55d1
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
							
							
							
							
							
						 | 
						
							2021-04-09 15:58:49 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a2065c13f2
								
							
								
							
						 | 
						
							
							
								
								【社稷大典】领取贡献等级奖励,界面会重复播放打开时的动画
							
							
							
							
							
						 | 
						
							2021-04-09 15:58:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								17c39e0d74
								
							
								
							
						 | 
						
							
							
								
								【本地化】翻译资源导入
							
							
							
							
							
						 | 
						
							2021-04-09 15:25:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								66763117a3
								
							
								
							
						 | 
						
							
							
								
								立绘修改提交
							
							
							
							
							
						 | 
						
							2021-04-09 15:22:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1d447aee82
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
							
							
							
							
							
						 | 
						
							2021-04-09 14:48:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5de102eb06
								
							
								
							
						 | 
						
							
							
								
								【天枢密卷】灯笼文字超框修改
							
							
							
							
							
						 | 
						
							2021-04-09 14:48:01 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4015e2a616
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
							
							
							
							
							
						 | 
						
							2021-04-09 14:14:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								75bd39a6c2
								
							
								
							
						 | 
						
							
							
								
								【icon】新增宝箱Icon
							
							
							
							
							
						 | 
						
							2021-04-09 14:13:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cb89c89435
								
							
								
							
						 | 
						
							
							
								
								【限时神装】更改价格单位
							
							
							
							
							
						 | 
						
							2021-04-09 14:13:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3471fde5d2
								
							
								
							
						 | 
						
							
							
								
								重复资源提交
							
							
							
							
							
						 | 
						
							2021-04-09 13:55:55 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9496ef8943
								
							
								
							
						 | 
						
							
							
								
								meta 文件提交
							
							
							
							
							
							
							
							(cherry picked from commit e0fec1aa3a) 
							
						 | 
						
							2021-04-09 13:42:03 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								071a91773a
								
							
								
							
						 | 
						
							
							
								
								导出 文本提交
							
							
							
							
							
						 | 
						
							2021-04-09 12:26:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								8291a48e73
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china_dev_merge' into xma_dev_b_merge
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
#	Assets/ManagedResources/Icon/ChengHao.meta
#	Assets/ManagedResources/Icon/ZuoQi.meta
#	Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/View/FetterItem.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua 
							
						 | 
						
							2021-04-09 12:24:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0ab7c3177a
								
							
								
							
						 | 
						
							
							
								
								还原文字提交
							
							
							
							
							
						 | 
						
							2021-04-09 12:06:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								38e64fb774
								
							
								
							
						 | 
						
							
							
								
								还原文字提交
							
							
							
							
							
						 | 
						
							2021-04-09 11:39:09 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6db7d3ac5c
								
							
								
							
						 | 
						
							
							
								
								车迟斗法开启提示修改
							
							
							
							
							
						 | 
						
							2021-04-09 11:11:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								ca5257e28d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
							
							
							
							
							
						 | 
						
							2021-04-09 11:07:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8893dd7d7b
								
							
								
							
						 | 
						
							
							
								
								【活动优化】日周月礼包增加角标及妖晶数量变更
							
							
							
							
							
						 | 
						
							2021-04-09 11:05:08 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3bd507747e
								
							
								
							
						 | 
						
							
							
								
								【车迟斗法】车迟斗法倒计时不是在战斗结束开始计算
							
							
							
							
							
						 | 
						
							2021-04-09 10:57:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								115b2ee04d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
							
							
							
							
							
						 | 
						
							2021-04-09 09:18:03 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								af967ecf93
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
							
							
							
							
							
						 | 
						
							2021-04-08 21:10:41 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d19f1cce1c
								
							
								
							
						 | 
						
							
							
								
								[战斗]=====被动214,238修改     bug:1014491    1013881
							
							
							
							
							
						 | 
						
							2021-04-08 21:09:29 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a3647d7cbe
								
							
								
							
						 | 
						
							
							
								
								【排行榜】与排行第一切磋后返回,不显示小人形象
							
							
							
							
							
						 | 
						
							2021-04-08 21:07:36 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								19ba1ffc5a
								
							
								
							
						 | 
						
							
							
								
								【分解】神将达到上限,分解后,再获得神将依然提示已达上限,重登正常
							
							
							
							
							
						 | 
						
							2021-04-08 21:03:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fa4cdf0f2d
								
							
								
							
						 | 
						
							
							
								
								主城添加判断等级判断
							
							
							
							
							
						 | 
						
							2021-04-08 20:55:49 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e14b9d4343
								
							
								
							
						 | 
						
							
							
								
								主城修改  提交
							
							
							
							
							
						 | 
						
							2021-04-08 20:52:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								075101090d
								
							
								
							
						 | 
						
							
							
								
								【首充】文字显示调整
							
							
							
							
							
						 | 
						
							2021-04-08 20:52:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3edd56034a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
							
							
							
							
							
						 | 
						
							2021-04-08 20:48:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b3aa8ebf2a
								
							
								
							
						 | 
						
							
							
								
								【神将置换】英雄名过长修改
							
							
							
							
							
						 | 
						
							2021-04-08 20:48:17 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ba17f4fdc2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
							
							
							
							
							
						 | 
						
							2021-04-08 20:40:05 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								eab8a42191
								
							
								
							
						 | 
						
							
							
								
								【灵兽特惠】金钱显示兼容
							
							
							
							
							
						 | 
						
							2021-04-08 20:40:00 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								393a05ee99
								
							
								
							
						 | 
						
							
							
								
								【大闹天宫】生死簿神将头像边框颜色与品质不符
							
							
							
							
							
						 | 
						
							2021-04-08 20:27:21 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								4a1a95d9fd
								
							
								
							
						 | 
						
							
							
								
								【八日登录】修复第四天后的提示白片
							
							
							
							
							
						 | 
						
							2021-04-08 20:23:06 +08:00 |