wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								443ba942cf
								
							
								
							
						 | 
						
							
							
								
								[功能]================称号功能提交
							
							
							
							
							
						 | 
						
							2021-04-12 16:23:57 +08:00 | 
						
					
				
					
						
							
							
								 
								JLIOSM1
							
						 | 
						
							
							
							
							
								
							
								e99b368abb
								
							
								
							
						 | 
						
							
							
								
								【adjust】修复打点错误
							
							
							
							
							
						 | 
						
							2021-04-11 04:21:55 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								196dfa34dd
								
							
								
							
						 | 
						
							
							
								
								【GM】添加红点数据查看工具
							
							
							
							
							
						 | 
						
							2021-04-09 16:14:24 +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
							
						 | 
						
							
							
							
							
								
							
								ce8ffa9607
								
							
								
							
						 | 
						
							
							
								
								充值界面充值跳转月卡页签之后切换其他页签 界面显示错误  修改
							
							
							
							
							
						 | 
						
							2021-04-08 10:50:19 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bfaa5195b5
								
							
								
							
						 | 
						
							
							
								
								Revert "【表删除】报错处理"
							
							
							
							
							
							
							
							This reverts commit b163fc3035. 
							
						 | 
						
							2021-04-07 11:54:39 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								58d20c0bd3
								
							
								
							
						 | 
						
							
							
								
								【限时活动】没东西有红点
							
							
							
							
							
						 | 
						
							2021-04-07 11:05:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9033d47109
								
							
								
							
						 | 
						
							
							
								
								【本地化】文本导出
							
							
							
							
							
						 | 
						
							2021-04-06 22:33:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								63bcee6168
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/十五日登录' into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua 
							
						 | 
						
							2021-04-06 15:51:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b163fc3035
								
							
								
							
						 | 
						
							
							
								
								【表删除】报错处理
							
							
							
							
							
						 | 
						
							2021-04-06 15:16:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d69d96a321
								
							
								
							
						 | 
						
							
							
								
								【十五日登陆】红点
							
							
							
							
							
						 | 
						
							2021-04-02 11:53:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								b53717c9ee
								
							
								
							
						 | 
						
							
							
								
								【本地化】还原文本
							
							
							
							
							
						 | 
						
							2021-04-01 18:41:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								cbb28ebeae
								
							
								
							
						 | 
						
							
							
								
								【本地化】文本导出
							
							
							
							
							
						 | 
						
							2021-04-01 18:36:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e86078ce69
								
							
								
							
						 | 
						
							
							
								
								【十五日登陆】
							
							
							
							
							
						 | 
						
							2021-04-01 16:04:13 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a6428eaaed
								
							
								
							
						 | 
						
							
							
								
								红点 修改提交
							
							
							
							
							
						 | 
						
							2021-04-01 13:44:05 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								01aacccfaf
								
							
								
							
						 | 
						
							
							
								
								【红点】修复方法名错误
							
							
							
							
							
						 | 
						
							2021-03-31 22:31:36 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								784ace13b5
								
							
								
							
						 | 
						
							
							
								
								红点提交
							
							
							
							
							
						 | 
						
							2021-03-31 22:22:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7d055c4e3a
								
							
								
							
						 | 
						
							
							
								
								红点提交
							
							
							
							
							
						 | 
						
							2021-03-31 21:46:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4c7bd53d20
								
							
								
							
						 | 
						
							
							
								
								【称号坐骑时装】战力向后的发送请求
							
							
							
							
							
						 | 
						
							2021-03-31 10:16:52 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0494e55215
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua 
							
						 | 
						
							2021-03-30 20:41:32 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								62a064b33e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0活动开发聚集地/福星高照
							
							
							
							
							
						 | 
						
							2021-03-30 20:21:32 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ea9d0ba287
								
							
								
							
						 | 
						
							
							
								
								【称号坐骑时装】 激活时 向后的发送战力改变
							
							
							
							
							
						 | 
						
							2021-03-30 20:20:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								23b46ba218
								
							
								
							
						 | 
						
							
							
								
								活动 修改提交
							
							
							
							
							
						 | 
						
							2021-03-30 20:17:26 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d61c55d24d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0活动开发聚集地/福星高照
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua 
							
						 | 
						
							2021-03-30 18:55:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c2fac79eca
								
							
								
							
						 | 
						
							
							
								
								活动  提交
							
							
							
							
							
						 | 
						
							2021-03-30 18:26:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								87e724d19d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Common/functions.lua 
							
						 | 
						
							2021-03-30 13:48:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ed1d9a2b1f
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/天书秘卷' into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua 
							
						 | 
						
							2021-03-30 13:46:49 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2122997c3d
								
							
								
							
						 | 
						
							
							
								
								【称号坐骑时装】修改
							
							
							
							
							
						 | 
						
							2021-03-30 11:38:20 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								25e351dba3
								
							
								
							
						 | 
						
							
							
								
								【称号坐骑时装】修改
							
							
							
							
							
						 | 
						
							2021-03-30 10:28:03 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8796bf4957
								
							
								
							
						 | 
						
							
							
								
								【福星高照】提交
							
							
							
							
							
						 | 
						
							2021-03-30 10:27:18 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								76c9760993
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/称号坐骑皮肤
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab 
							
						 | 
						
							2021-03-29 17:56:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								db6f2d0b32
								
							
								
							
						 | 
						
							
							
								
								【称号坐骑时装】提交
							
							
							
							
							
						 | 
						
							2021-03-29 17:53:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								cbdfb75576
								
							
								
							
						 | 
						
							
							
								
								【称号坐骑时装】提交
							
							
							
							
							
						 | 
						
							2021-03-29 16:45:04 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								2a0ce862ae
								
							
								
							
						 | 
						
							
							
								
								【红点添加】限时兑换添加红点提示-关闭红点log
							
							
							
							
							
						 | 
						
							2021-03-29 14:54:13 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								a599ef10f9
								
							
								
							
						 | 
						
							
							
								
								【红点添加】限时兑换添加红点提示
							
							
							
							
							
						 | 
						
							2021-03-29 14:37:15 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								51bb90edce
								
							
								
							
						 | 
						
							
							
								
								【称号坐骑时装】 协议 无尽副本修改
							
							
							
							
							
						 | 
						
							2021-03-29 12:07:28 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								9637337c39
								
							
								
							
						 | 
						
							
							
								
								【称号坐骑时装】 修改提交
							
							
							
							
							
						 | 
						
							2021-03-27 20:01:39 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								5883b66fca
								
							
								
							
						 | 
						
							
							
								
								【十绝阵】开服3天内通过公会御令获取途径可以进入
							
							
							
							
							
						 | 
						
							2021-03-27 17:44:05 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								095701c33f
								
							
								
							
						 | 
						
							
							
								
								【称号时装坐骑】初提
							
							
							
							
							
						 | 
						
							2021-03-26 20:06:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								24fa8c17e2
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0活动开发聚集地/牛气冲天' into china/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua 
							
						 | 
						
							2021-03-25 11:13:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								d00236d6d0
								
							
								
							
						 | 
						
							
							
								
								【称号 时装 坐骑】 协议数据提交
							
							
							
							
							
						 | 
						
							2021-03-24 21:05:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e8219c11b0
								
							
								
							
						 | 
						
							
							
								
								【牛气冲天】提交
							
							
							
							
							
						 | 
						
							2021-03-24 20:19:40 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								298946dd2d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/天书秘卷
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua 
							
						 | 
						
							2021-03-23 16:54:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								44806a302d
								
							
								
							
						 | 
						
							
							
								
								红点提交
							
							
							
							
							
						 | 
						
							2021-03-23 16:52:19 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9e19cd5322
								
							
								
							
						 | 
						
							
							
								
								红点提交
							
							
							
							
							
						 | 
						
							2021-03-23 14:13:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a4facd8d13
								
							
								
							
						 | 
						
							
							
								
								天书秘卷
							
							
							
							
							
						 | 
						
							2021-03-22 15:16:29 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								830f7d3dd9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
							
							
							
							
							
						 | 
						
							2021-03-22 13:48:06 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								dc5d0a2d12
								
							
								
							
						 | 
						
							
							
								
								【修复主城人物层级bug】
							
							
							
							
							
						 | 
						
							2021-03-22 13:47:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								835ebf10c7
								
							
								
							
						 | 
						
							
							
								
								【bug】头像,头像框判断是否要进入版本
							
							
							
							
							
						 | 
						
							2021-03-19 20:24:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ec8ff74e61
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'china/dev' into 0功能/天书秘卷
							
							
							
							
							
						 | 
						
							2021-03-19 15:11:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								194160cc40
								
							
								
							
						 | 
						
							
							
								
								【2倍速修改】
							
							
							
							
							
						 | 
						
							2021-03-19 11:45:08 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								9f2d86c2a1
								
							
								
							
						 | 
						
							
							
								
								天书秘卷
							
							
							
							
							
						 | 
						
							2021-03-17 14:29:34 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8aad1eee56
								
							
								
							
						 | 
						
							
							
								
								【限时神装】
							
							
							
							
							
						 | 
						
							2021-03-12 14:31:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0991575155
								
							
								
							
						 | 
						
							
							
								
								提示修改
							
							
							
							
							
						 | 
						
							2021-03-04 16:43:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d81075da7a
								
							
								
							
						 | 
						
							
							
								
								还原lua
							
							
							
							
							
						 | 
						
							2021-03-02 16:53:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								88e59e0c7c
								
							
								
							
						 | 
						
							
							
								
								lua 提交
							
							
							
							
							
						 | 
						
							2021-03-02 15:49:02 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e4f4649cf9
								
							
								
							
						 | 
						
							
							
								
								文本提交
							
							
							
							
							
						 | 
						
							2021-02-20 18:01:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a05694855c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'local_to_xmadev' into xma/dev
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
#	Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpView.lua
#	Assets/ManagedResources/~Lua/View/ShopView.lua 
							
						 | 
						
							2021-02-20 17:55:52 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								629971d137
								
							
								
							
						 | 
						
							
							
								
								文本还原提交
							
							
							
							
							
						 | 
						
							2021-02-20 16:55:28 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								602dbc924c
								
							
								
							
						 | 
						
							
							
								
								文本还原
							
							
							
							
							
						 | 
						
							2021-02-20 16:43:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1c95b576f0
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/鸿蒙门阵' into 0功能/本周版本优化内容
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/ScrollCycleView.lua 
							
						 | 
						
							2021-02-19 10:54:36 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								78e7305c15
								
							
								
							
						 | 
						
							
							
								
								【本地化】导出中文
							
							
							
							
							
						 | 
						
							2021-02-05 15:58:37 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								90bf24b3b0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into gx/xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ActivityGift/CourtesyDressPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
#	Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpView.lua
#	Assets/ManagedResources/~Lua/View/ShopView.lua 
							
						 | 
						
							2021-02-05 14:30:05 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								927025f6de
								
							
								
							
						 | 
						
							
							
								
								【本地化】中文字还原,合并用
							
							
							
							
							
						 | 
						
							2021-02-05 12:44:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								5ce8497899
								
							
								
							
						 | 
						
							
							
								
								【本地化】中文字还原,合并用
							
							
							
							
							
						 | 
						
							2021-02-05 12:00:39 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								02504b0020
								
							
								
							
						 | 
						
							
							
								
								【限时兑换跳转】修复
							
							
							
							
							
						 | 
						
							2021-01-28 20:12:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ba6db73270
								
							
								
							
						 | 
						
							
							
								
								【NPC】去重
							
							
							
							
							
						 | 
						
							2021-01-28 15:27:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a0a2ac324a
								
							
								
							
						 | 
						
							
							
								
								【NPC】优化
							
							
							
							
							
						 | 
						
							2021-01-28 14:48:57 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6f03f8cc9d
								
							
								
							
						 | 
						
							
							
								
								【抽卡动画 NPC】 提交
							
							
							
							
							
						 | 
						
							2021-01-28 11:55:26 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ad451253cb
								
							
								
							
						 | 
						
							
							
								
								【优化】主城假人改为NPC或者排行榜角色  3
							
							
							
							
							
						 | 
						
							2021-01-27 18:20:50 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								adf591cbec
								
							
								
							
						 | 
						
							
							
								
								【本地化】lua代码还原
							
							
							
							
							
						 | 
						
							2021-01-27 18:16:54 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								122ccb94e2
								
							
								
							
						 | 
						
							
							
								
								【优化】主城假人改为NPC或者排行榜角色 2
							
							
							
							
							
						 | 
						
							2021-01-27 17:36:33 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								7b01f5fc07
								
							
								
							
						 | 
						
							
							
								
								【优化】主城假人改为NPC或者排行榜角色
							
							
							
							
							
						 | 
						
							2021-01-27 16:40:17 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								c567dcd426
								
							
								
							
						 | 
						
							
							
								
								【本地化】代码本地化提交
							
							
							
							
							
						 | 
						
							2021-01-26 17:08:39 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								81b3ca1ddc
								
							
								
							
						 | 
						
							
							
								
								【本地化】 中文字还原,合并代码用
							
							
							
							
							
						 | 
						
							2021-01-26 11:13:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								802881378c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into gx/xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua 
							
						 | 
						
							2021-01-26 11:08:54 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								3b83a72215
								
							
								
							
						 | 
						
							
							
								
								【本地化】文字还原
							
							
							
							
							
						 | 
						
							2021-01-26 11:05:27 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								5a11596515
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵修改】
							
							
							
							
							
						 | 
						
							2021-01-18 17:43:11 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								344ec52500
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛头像修改】
							
							
							
							
							
						 | 
						
							2021-01-18 15:07:23 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-98AVA47\Administrator
							
						 | 
						
							
							
							
							
								
							
								c57a5ec8eb
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛头像框修改】
							
							
							
							
							
						 | 
						
							2021-01-18 10:33:32 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-98AVA47\Administrator
							
						 | 
						
							
							
							
							
								
							
								040971534e
								
							
								
							
						 | 
						
							
							
								
								【巅峰赛限时头像修改】
							
							
							
							
							
						 | 
						
							2021-01-15 21:06:48 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								3f8312953e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
							
							
							
							
							
						 | 
						
							2021-01-14 10:20:12 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a75d553a6a
								
							
								
							
						 | 
						
							
							
								
								【无尽副本】世界等级显示1级 修改
							
							
							
							
							
						 | 
						
							2021-01-13 11:04:28 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f501e92272
								
							
								
							
						 | 
						
							
							
								
								【本地化】代码还原,合并用
							
							
							
							
							
						 | 
						
							2021-01-12 11:00:44 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ae7da93056
								
							
								
							
						 | 
						
							
							
								
								【本地化】还原文字
							
							
							
							
							
						 | 
						
							2021-01-12 10:56:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								27b3c1ea32
								
							
								
							
						 | 
						
							
							
								
								【本地化】还原文本到代码中合并用
							
							
							
							
							
						 | 
						
							2021-01-09 14:20:06 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-98AVA47\Administrator
							
						 | 
						
							
							
							
							
								
							
								e3ffcb23b8
								
							
								
							
						 | 
						
							
							
								
								【(送神祠)选择属性筛选后进行恭送神将、神将归元、法宝归元、宝物分解优化】
							
							
							
							
							
						 | 
						
							2021-01-08 19:16:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d09bc60b5e
								
							
								
							
						 | 
						
							
							
								
								【森罗幻境】红点刷新修改
							
							
							
							
							
						 | 
						
							2021-01-08 19:08:04 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								6c191263bd
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Expedition.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua 
							
						 | 
						
							2021-01-06 20:05:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								31c5aa7580
								
							
								
							
						 | 
						
							
							
								
								【森罗幻境】红点刷新修改
							
							
							
							
							
						 | 
						
							2021-01-06 17:30:48 +08:00 | 
						
					
				
					
						
							
							
								 
								DESKTOP-98AVA47\Administrator
							
						 | 
						
							
							
							
							
								
							
								238c0706c0
								
							
								
							
						 | 
						
							
							
								
								【(送神祠)选择属性筛选后进行恭送神将、神将归元、法宝归元、宝物分解优化】
							
							
							
							
							
						 | 
						
							2021-01-05 14:29:33 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								8a3eb5aab8
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵成就补充】
							
							
							
							
							
						 | 
						
							2021-01-05 14:26:26 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								4d951b38bd
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵成就】
							
							
							
							
							
						 | 
						
							2021-01-05 10:46:35 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								94f549f605
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵成就 任务】
							
							
							
							
							
						 | 
						
							2021-01-04 19:40:39 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								b995971610
								
							
								
							
						 | 
						
							
							
								
								【森罗】跳转
							
							
							
							
							
						 | 
						
							2021-01-04 18:29:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bf6fd2d13d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
							
							
							
							
							
							
							
							# Conflicts:
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua 
							
						 | 
						
							2020-12-26 20:22:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c5022043fd
								
							
								
							
						 | 
						
							
							
								
								【道具使用跳转】跳转后返回关闭弹窗界面
							
							
							
							
							
							
							
							(cherry picked from commit 150ec3eb2f) 
							
						 | 
						
							2020-12-24 16:43:37 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4faa39ab2a
								
							
								
							
						 | 
						
							
							
								
								【道具使用跳转】使用跳转修改,活动道具要大于10000
							
							
							
							
							
							
							
							(cherry picked from commit b2f8d14470) 
							
						 | 
						
							2020-12-24 16:42:24 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								1f05f5f8f6
								
							
								
							
						 | 
						
							
							
								
								逍遥游 红点提交
							
							
							
							
							
						 | 
						
							2020-12-24 16:19:46 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3a6e07bf1c
								
							
								
							
						 | 
						
							
							
								
								【逍遥游优化】逍遥游玩法优化内容
							
							
							
							
							
						 | 
						
							2020-12-23 20:18:43 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								d0b94a1c3b
								
							
								
							
						 | 
						
							
							
								
								【新将活动】新将来袭、新疆招募、升星有礼 提交
							
							
							
							
							
						 | 
						
							2020-12-23 14:36:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6fc63af086
								
							
								
							
						 | 
						
							
							
								
								【增加跳转】增加跳转id
							
							
							
							
							
						 | 
						
							2020-12-23 11:31:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								12760d7cb1
								
							
								
							
						 | 
						
							
							
								
								【升星有礼】完成
							
							
							
							
							
						 | 
						
							2020-12-21 15:41:31 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								4f4542d53a
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】
							
							
							
							
							
						 | 
						
							2020-12-18 13:39:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								8df6de20e5
								
							
								
							
						 | 
						
							
							
								
								【副本】isInMap字段删除bug修复
							
							
							
							
							
						 | 
						
							2020-11-16 15:24:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a5c36cf58a
								
							
								
							
						 | 
						
							
							
								
								【灵兽宝阁】未开启更换灵兽版本
							
							
							
							
							
						 | 
						
							2020-11-12 17:11:18 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								23717d6fc9
								
							
								
							
						 | 
						
							
							
								
								【特权】修复获取特权次数会小于0的问题,解决急速探索会出现剩余次数为负数的问题
							
							
							
							
							
						 | 
						
							2020-11-03 15:34:12 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								54f1660bc2
								
							
								
							
						 | 
						
							
							
								
								【好友切磋】修复战斗结果显示错误的问题
							
							
							
							
							
						 | 
						
							2020-11-02 19:17:19 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								3479bd153c
								
							
								
							
						 | 
						
							
							
								
								【灵兽系统】 合并 功能ok 但是战斗合完进不去
							
							
							
							
							
						 | 
						
							2020-10-31 17:01:46 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0bf6e05add
								
							
								
							
						 | 
						
							
							
								
								【社稷大典】提交6
							
							
							
							
							
						 | 
						
							2020-10-24 18:58:07 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f57b10696f
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】云游值自动恢复修改
							
							
							
							
							
						 | 
						
							2020-10-20 00:29:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d9434f425d
								
							
								
							
						 | 
						
							
							
								
								修复部分奖励不刷新的问题
							
							
							
							
							
						 | 
						
							2020-10-20 00:28:41 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								a3c461aff9
								
							
								
							
						 | 
						
							
							
								
								云游值恢复问题修改
							
							
							
							
							
						 | 
						
							2020-10-20 00:28:09 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f53a566ce8
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】功能入口随功能开启添加
							
							
							
							
							
						 | 
						
							2020-10-19 22:57:02 +08:00 | 
						
					
				
					
						
							
							
								 
								yuanshuai
							
						 | 
						
							
							
							
							
								
							
								131d1aab1b
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】红点和帮助弹窗提交
							
							
							
							
							
						 | 
						
							2020-10-19 21:39:48 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								364c9c99fc
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】功能合并到local分支
							
							
							
							
							
						 | 
						
							2020-10-19 20:37:53 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								05780afedb
								
							
								
							
						 | 
						
							
							
								
								【自动恢复物品】物品恢复机制改为前端计算
							
							
							
							
							
						 | 
						
							2020-10-19 18:37:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f35bad0ee2
								
							
								
							
						 | 
						
							
							
								
								神州令跳转修改
							
							
							
							
							
						 | 
						
							2020-10-15 21:36:16 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f2d3f045aa
								
							
								
							
						 | 
						
							
							
								
								森罗幻境提交1
							
							
							
							
							
						 | 
						
							2020-10-12 14:46:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0c91a81329
								
							
								
							
						 | 
						
							
							
								
								【跳转】碧海卷使用按钮跳转位置不正确
							
							
							
							
							
						 | 
						
							2020-10-15 16:05:53 +08:00 | 
						
					
				
					
						
							
							
								 
								liujiaqi
							
						 | 
						
							
							
							
							
								
							
								783c61eed8
								
							
								
							
						 | 
						
							
							
								
								修复新玩家登陆卡在登陆100%
							
							
							
							
							
						 | 
						
							2020-09-27 20:40:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6a764f569e
								
							
								
							
						 | 
						
							
							
								
								跳转限时兑换修改
							
							
							
							
							
						 | 
						
							2020-09-27 16:21:42 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								96ab48c22f
								
							
								
							
						 | 
						
							
							
								
								遴选 线上活动: 三周活动 寻宝达人  四周 天宫达人2  有中文表
							
							
							
							
							
						 | 
						
							2020-09-27 16:14:42 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bd6fdce461
								
							
								
							
						 | 
						
							
							
								
								遴选  线上活动 :   三周活动 寻宝达人  四周  天宫达人
							
							
							
							
							
						 | 
						
							2020-09-27 16:12:21 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								d8013ccd8c
								
							
								
							
						 | 
						
							
							
								
								打开充值每日礼包 和 成长礼包 红点检测
							
							
							
							
							
						 | 
						
							2020-09-21 16:40:18 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5a861862d5
								
							
								
							
						 | 
						
							
							
								
								商店添加动画
							
							
							
							
							
						 | 
						
							2020-09-04 16:54:58 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								04b18aa4ad
								
							
								
							
						 | 
						
							
							
								
								竞技场有免费次数 时提示红点
							
							
							
							
							
						 | 
						
							2020-09-03 14:42:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								c3b0f590d2
								
							
								
							
						 | 
						
							
							
								
								好友增加一键领取红点
							
							
							
							
							
						 | 
						
							2020-09-03 10:50:25 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								541d4277c7
								
							
								
							
						 | 
						
							
							
								
								部分界面屏幕适配修改
							
							
							
							
							
						 | 
						
							2020-09-02 16:11:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5b68ae2cb9
								
							
								
							
						 | 
						
							
							
								
								tujian commit
							
							
							
							
							
						 | 
						
							2020-09-12 14:12:26 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								aabef68ccb
								
							
								
							
						 | 
						
							
							
								
								气泡提交
							
							
							
							
							
						 | 
						
							2020-09-01 11:50:24 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e74c120d01
								
							
								
							
						 | 
						
							
							
								
								大闹天宫重置红点、无尽副本界面红点
							
							
							
							
							
						 | 
						
							2020-09-01 11:25:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a6fa4453e6
								
							
								
							
						 | 
						
							
							
								
								需求主城或关卡停留过长添加聊天气泡
							
							
							
							
							
						 | 
						
							2020-08-31 20:52:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								40266d1120
								
							
								
							
						 | 
						
							
							
								
								删除一些log、修复升级豪礼红点bug
							
							
							
							
							
						 | 
						
							2020-08-31 16:32:27 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2bf39b8a9c
								
							
								
							
						 | 
						
							
							
								
								副本红点提交
							
							
							
							
							
						 | 
						
							2020-08-31 15:01:20 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								366343b72b
								
							
								
							
						 | 
						
							
							
								
								副本红点修改提交
							
							
							
							
							
						 | 
						
							2020-08-31 13:58:47 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6436392c8e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
							
							
							
							
							
						 | 
						
							2020-08-29 17:36:42 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								93602b9cfb
								
							
								
							
						 | 
						
							
							
								
								commit
							
							
							
							
							
						 | 
						
							2020-08-29 17:36:28 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								a99aa6ef6e
								
							
								
							
						 | 
						
							
							
								
								还是红点检测
							
							
							
							
							
						 | 
						
							2020-08-28 17:29:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0c3b0e6326
								
							
								
							
						 | 
						
							
							
								
								车迟斗法副本界面红点
							
							
							
							
							
						 | 
						
							2020-08-28 16:35:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								01fc7cae51
								
							
								
							
						 | 
						
							
							
								
								森罗幻境奖励红点
							
							
							
							
							
						 | 
						
							2020-08-28 13:48:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								cdc5c07b84
								
							
								
							
						 | 
						
							
							
								
								天宫秘宝在副本界面的红点
							
							
							
							
							
						 | 
						
							2020-08-28 10:36:09 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								811418e222
								
							
								
							
						 | 
						
							
							
								
								森罗 无尽红点
							
							
							
							
							
						 | 
						
							2020-08-27 13:59:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dc9615b4fc
								
							
								
							
						 | 
						
							
							
								
								无尽进图武神将问题、取消对话战斗结束神将数据界面
							
							
							
							
							
						 | 
						
							2020-08-26 16:22:37 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3deb27c862
								
							
								
							
						 | 
						
							
							
								
								跳转无尽副本修改
							
							
							
							
							
						 | 
						
							2020-08-26 14:53:31 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								7f9c8122c4
								
							
								
							
						 | 
						
							
							
								
								跳转修改提交
							
							
							
							
							
						 | 
						
							2020-08-26 14:51:10 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								4d19e7ce98
								
							
								
							
						 | 
						
							
							
								
								中文表导出提交
							
							
							
							
							
						 | 
						
							2020-08-25 15:46:38 +08:00 |