jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e42193d264
								
							
								
							
						 | 
						
							
							
								
								轩辕,森罗修改
							
							
							
							
							
						 | 
						
							2021-02-24 17:37:56 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								16a4fa4dde
								
							
								
							
						 | 
						
							
							
								
								【本地化】灵兽界面 福利界面
							
							
							
							
							
						 | 
						
							2021-02-24 17:36:24 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bb68af637a
								
							
								
							
						 | 
						
							
							
								
								【战斗】修复孙悟空和观音菩萨同时死亡导致报错的问题
							
							
							
							
							
						 | 
						
							2021-02-24 17:02:31 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								d454c3bf08
								
							
								
							
						 | 
						
							
							
								
								【神将定位】觉醒后神将定位可能发生变化,但定位弹窗内容未改变
							
							
							
							
							
						 | 
						
							2021-02-24 16:47:20 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								6b128d46ef
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev_temp' into xma/dev
							
							
							
							
							
						 | 
						
							2021-02-24 15:08:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								541b45e6ea
								
							
								
							
						 | 
						
							
							
								
								排行榜提交
							
							
							
							
							
						 | 
						
							2021-02-24 15:07:31 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1d7f5572cb
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
							
							
							
							
							
						 | 
						
							2021-02-24 14:45:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								10e8da678a
								
							
								
							
						 | 
						
							
							
								
								【本地化】天宫寻宝相关修改
							
							
							
							
							
						 | 
						
							2021-02-24 14:45:09 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								af1bb0eb78
								
							
								
							
						 | 
						
							
							
								
								礼包抢购 积天豪礼 修改
							
							
							
							
							
						 | 
						
							2021-02-24 14:04:32 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								fc7879a56a
								
							
								
							
						 | 
						
							
							
								
								【本地化】我要变强 首充
							
							
							
							
							
						 | 
						
							2021-02-24 11:47:07 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f3e44753e2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
							
							
							
							
							
						 | 
						
							2021-02-24 11:24:01 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								74185b0d1b
								
							
								
							
						 | 
						
							
							
								
								【本地化】
							
							
							
							
							
						 | 
						
							2021-02-24 11:23:53 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5acf0b2ed2
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
							
							
							
							
							
						 | 
						
							2021-02-24 11:15:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								45a4b740d2
								
							
								
							
						 | 
						
							
							
								
								红包修改提交
							
							
							
							
							
						 | 
						
							2021-02-24 11:15:03 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								23fa451553
								
							
								
							
						 | 
						
							
							
								
								【gm】方法名重复
							
							
							
							
							
						 | 
						
							2021-02-24 11:11:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ac3fe3f251
								
							
								
							
						 | 
						
							
							
								
								【升星界面调整】9升10星,十星位置需调整
							
							
							
							
							
						 | 
						
							2021-02-24 10:53:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								fc75b356b0
								
							
								
							
						 | 
						
							
							
								
								公会修改
							
							
							
							
							
						 | 
						
							2021-02-24 10:21:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								dc42a492e7
								
							
								
							
						 | 
						
							
							
								
								【排行榜优化】排行榜信息分页读取
							
							
							
							
							
						 | 
						
							2021-02-24 10:13:43 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								91f46cb250
								
							
								
							
						 | 
						
							
							
								
								【本地化】森罗幻境修改
							
							
							
							
							
						 | 
						
							2021-02-24 09:48:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b9d35e4671
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
							
							
							
							
							
						 | 
						
							2021-02-23 20:57:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								f98e81bb37
								
							
								
							
						 | 
						
							
							
								
								【本地化】无尽副本界面左上右上调整
							
							
							
							
							
						 | 
						
							2021-02-23 20:57:26 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								497729e762
								
							
								
							
						 | 
						
							
							
								
								【优化】查找合成的时候英雄名字查找困难 英雄名字放在主页上
							
							
							
							
							
						 | 
						
							2021-02-23 20:50:56 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								576400a914
								
							
								
							
						 | 
						
							
							
								
								公会商店本地化修改提交
							
							
							
							
							
						 | 
						
							2021-02-23 20:50:34 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f7d62a72fc
								
							
								
							
						 | 
						
							
							
								
								恭喜获得界面中,道具名称过长的情况,改为显示4个字+省略号的形式显示,参考背包即可
							
							
							
							
							
						 | 
						
							2021-02-23 20:37:57 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								59af047cd9
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
							
							
							
							
							
						 | 
						
							2021-02-23 20:18:32 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f5450e201d
								
							
								
							
						 | 
						
							
							
								
								公会提交
							
							
							
							
							
						 | 
						
							2021-02-23 20:18:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								82db5c4b57
								
							
								
							
						 | 
						
							
							
								
								【本地化】排行榜修改
							
							
							
							
							
						 | 
						
							2021-02-23 20:13:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								169ad402c7
								
							
								
							
						 | 
						
							
							
								
								【本地化】修复白片得问题
							
							
							
							
							
						 | 
						
							2021-02-23 19:12:16 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								1c77912e61
								
							
								
							
						 | 
						
							
							
								
								【本地化】开服狂欢修改
							
							
							
							
							
						 | 
						
							2021-02-23 18:15:15 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								543e0b7b22
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
							
							
							
							
							
						 | 
						
							2021-02-23 17:43:08 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5d1b8bf9b9
								
							
								
							
						 | 
						
							
							
								
								【本地化】界面挑战
							
							
							
							
							
						 | 
						
							2021-02-23 17:41:59 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ddad4544ed
								
							
								
							
						 | 
						
							
							
								
								tips 提交
							
							
							
							
							
						 | 
						
							2021-02-23 17:17:35 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								2bc7c4e72c
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】逍遥游玩法幻魔事件结算会显示之前的金币特效
							
							
							
							
							
						 | 
						
							2021-02-23 17:16:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								37375a41f8
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】请先解锁前一个共鸣位置
							
							
							
							
							
						 | 
						
							2021-02-23 17:16:32 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								cc9cb65b33
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
							
							
							
							
							
						 | 
						
							2021-02-23 17:07:33 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								64e2464cf9
								
							
								
							
						 | 
						
							
							
								
								【本地化】预设位置调整
							
							
							
							
							
						 | 
						
							2021-02-23 17:04:52 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								b79613bde7
								
							
								
							
						 | 
						
							
							
								
								图片提交
							
							
							
							
							
						 | 
						
							2021-02-23 16:52:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ced93fe8d3
								
							
								
							
						 | 
						
							
							
								
								【逍遥游】逍遥游玩法幻魔事件结算会显示之前的金币特效
							
							
							
							
							
						 | 
						
							2021-02-23 16:52:17 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								fb035643fe
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】请先解锁前一个共鸣位置
							
							
							
							
							
						 | 
						
							2021-02-23 16:21:42 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								da1aa31b3d
								
							
								
							
						 | 
						
							
							
								
								[战斗]=============混乱普攻逻辑修改
							
							
							
							
							
						 | 
						
							2021-02-23 17:03:10 +09:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3674cdd886
								
							
								
							
						 | 
						
							
							
								
								【本地化】神将装备界面调整
							
							
							
							
							
						 | 
						
							2021-02-23 14:57:04 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bec4de4ae2
								
							
								
							
						 | 
						
							
							
								
								【本地化】英雄界面下方页签调整
							
							
							
							
							
						 | 
						
							2021-02-23 14:20:39 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								d7d64948af
								
							
								
							
						 | 
						
							
							
								
								分解白片提交
							
							
							
							
							
						 | 
						
							2021-02-23 11:14:10 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								aa3a7c7dff
								
							
								
							
						 | 
						
							
							
								
								分解白片修改
							
							
							
							
							
						 | 
						
							2021-02-23 11:07:00 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								2ccb8b514d
								
							
								
							
						 | 
						
							
							
								
								解决冲突
							
							
							
							
							
						 | 
						
							2021-02-23 11:02:01 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								5f1d583737
								
							
								
							
						 | 
						
							
							
								
								白片修改提交
							
							
							
							
							
						 | 
						
							2021-02-23 10:57:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								a5453201cc
								
							
								
							
						 | 
						
							
							
								
								解决冲突
							
							
							
							
							
						 | 
						
							2021-02-23 10:53:33 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								6eb45cd1e6
								
							
								
							
						 | 
						
							
							
								
								预设白片提交
							
							
							
							
							
						 | 
						
							2021-02-23 10:51:52 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								e8ee62f9ab
								
							
								
							
						 | 
						
							
							
								
								【大闹天宫】重置提示错误
							
							
							
							
							
						 | 
						
							2021-02-23 10:40:58 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a6ac4320a7
								
							
								
							
						 | 
						
							
							
								
								【装备分解】筛选显示的是宝物
							
							
							
							
							
						 | 
						
							2021-02-23 10:00:39 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								23f9c2905d
								
							
								
							
						 | 
						
							
							
								
								【邮件】背包已满时领取邮件,领取按钮状态变为了删除,返回邮件列表,状态变为已领取(修复)
							
							
							
							
							
						 | 
						
							2021-02-22 21:17:06 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c4883087a5
								
							
								
							
						 | 
						
							
							
								
								lua 提交
							
							
							
							
							
						 | 
						
							2021-02-22 16:35:25 +08:00 | 
						
					
				
					
						
							
							
								 
								JieLing
							
						 | 
						
							
							
							
							
								
							
								a7bd8323ad
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】 红点刷新修改
							
							
							
							
							
						 | 
						
							2021-02-20 21:22:05 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								e4f4649cf9
								
							
								
							
						 | 
						
							
							
								
								文本提交
							
							
							
							
							
						 | 
						
							2021-02-20 18:01:57 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								bf24b8cc51
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】330  bug
							
							
							
							
							
						 | 
						
							2021-02-20 17:55: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 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								eaf34d9b6a
								
							
								
							
						 | 
						
							
							
								
								【邮件】一键领取红点检测刷新方法添加
							
							
							
							
							
						 | 
						
							2021-02-20 17:05:22 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								629971d137
								
							
								
							
						 | 
						
							
							
								
								文本还原提交
							
							
							
							
							
						 | 
						
							2021-02-20 16:55:28 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								4c03ec543d
								
							
								
							
						 | 
						
							
							
								
								【魂宝灵宝 重新初始化数据修改】
							
							
							
							
							
						 | 
						
							2021-02-20 16:45:21 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								602dbc924c
								
							
								
							
						 | 
						
							
							
								
								文本还原
							
							
							
							
							
						 | 
						
							2021-02-20 16:43:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								dd84a4bd3f
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】第一次激活鸿蒙碑的时候 两个329 替换位置 重置1级 错误bug 修复
							
							
							
							
							
						 | 
						
							2021-02-20 16:29:36 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								1e2c5ea7c6
								
							
								
							
						 | 
						
							
							
								
								【主城添加鸿蒙碑升级的红点检测】
							
							
							
							
							
						 | 
						
							2021-02-20 15:44:09 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								375f27f50e
								
							
								
							
						 | 
						
							
							
								
								【红点检测】
							
							
							
							
							
						 | 
						
							2021-02-20 14:52:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f0485649ab
								
							
								
							
						 | 
						
							
							
								
								预设修改提交
							
							
							
							
							
						 | 
						
							2021-02-20 14:40:01 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								b6e56efd1c
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】 升星红点检测添加鸿蒙共鸣条件
							
							
							
							
							
						 | 
						
							2021-02-20 13:56:16 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								39686223d0
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵】一键上阵
							
							
							
							
							
						 | 
						
							2021-02-20 11:37:56 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								4a4f613ab2
								
							
								
							
						 | 
						
							
							
								
								【红点修改】
							
							
							
							
							
						 | 
						
							2021-02-20 11:00:40 +08:00 | 
						
					
				
					
						
							
							
								 
								guowei
							
						 | 
						
							
							
							
							
								
							
								3c34072214
								
							
								
							
						 | 
						
							
							
								
								【鸿蒙阵修改】
							
							
							
							
							
						 | 
						
							2021-02-20 10:05:17 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								3b7ff95aaf
								
							
								
							
						 | 
						
							
							
								
								属性图标修改提交
							
							
							
							
							
						 | 
						
							2021-02-19 18:18:09 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								92e4a4a856
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
							
							
							
							
							
						 | 
						
							2021-02-19 17:50:16 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								05e1eceb99
								
							
								
							
						 | 
						
							
							
								
								属性图标修改
							
							
							
							
							
						 | 
						
							2021-02-19 17:50:10 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								56f68bd9a2
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
							
							
							
							
							
						 | 
						
							2021-02-19 16:39:54 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0584ed1e2f
								
							
								
							
						 | 
						
							
							
								
								【商店】元神商店页签提交
							
							
							
							
							
						 | 
						
							2021-02-19 16:39:27 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ef40c02a3e
								
							
								
							
						 | 
						
							
							
								
								【战斗】=======战斗回合数显示修改
							
							
							
							
							
						 | 
						
							2021-02-19 17:04:56 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								ba4cc03dc1
								
							
								
							
						 | 
						
							
							
								
								[战斗]===========被动298修改,最大回合数显示修改
							
							
							
							
							
						 | 
						
							2021-02-19 16:47:06 +09:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ca7a4aa10b
								
							
								
							
						 | 
						
							
							
								
								【装备数量显示】 装备数量 改为 装备种类
							
							
							
							
							
						 | 
						
							2021-02-19 15:13:38 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								242af5be93
								
							
								
							
						 | 
						
							
							
								
								特效层级修改
							
							
							
							
							
						 | 
						
							2021-02-19 13:44:12 +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 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								73f8e4d194
								
							
								
							
						 | 
						
							
							
								
								【元神商店】tab添加提交
							
							
							
							
							
						 | 
						
							2021-02-19 10:42:44 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ea9116aa21
								
							
								
							
						 | 
						
							
							
								
								切换语言修改提交
							
							
							
							
							
						 | 
						
							2021-02-18 17:29:04 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								f15fa6f1f9
								
							
								
							
						 | 
						
							
							
								
								越南语图片提交
							
							
							
							
							
						 | 
						
							2021-02-18 17:21:14 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								62230fe752
								
							
								
							
						 | 
						
							
							
								
								【魂印】合成去掉魂印文字
							
							
							
							
							
						 | 
						
							2021-02-18 15:29:40 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								459466ad49
								
							
								
							
						 | 
						
							
							
								
								【瑶池魔妖】 不显示圣物特殊处理
							
							
							
							
							
						 | 
						
							2021-02-18 15:02:12 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								0b5b98a77a
								
							
								
							
						 | 
						
							
							
								
								【活动需求】勇往直前主题活动(社稷大典)
							
							
							
							
							
						 | 
						
							2021-02-18 10:52:02 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								f34eb0c41a
								
							
								
							
						 | 
						
							
							
								
								逍遥特效提交
							
							
							
							
							
						 | 
						
							2021-02-05 16:46:08 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								32b4e236a0
								
							
								
							
						 | 
						
							
							
								
								[战斗]=================去除没必要的特性被动修改
							
							
							
							
							
						 | 
						
							2021-02-05 17:00:34 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								78e7305c15
								
							
								
							
						 | 
						
							
							
								
								【本地化】导出中文
							
							
							
							
							
						 | 
						
							2021-02-05 15:58:37 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								e9ea58aaf3
								
							
								
							
						 | 
						
							
							
								
								【本地化】界面冲突修正
							
							
							
							
							
						 | 
						
							2021-02-05 15:45:23 +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 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								44a0b80b84
								
							
								
							
						 | 
						
							
							
								
								【战斗】================不触发特性相关修改
							
							
							
							
							
						 | 
						
							2021-02-04 14:24:56 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								91a98b6715
								
							
								
							
						 | 
						
							
							
								
								【本地化】新翻译资源导出,修复限时召唤界面白片
							
							
							
							
							
						 | 
						
							2021-02-04 11:22:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								0ff345346b
								
							
								
							
						 | 
						
							
							
								
								【本地化】修复灵兽信息界面文字显示异常
							
							
							
							
							
						 | 
						
							2021-02-04 10:22:38 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								8ea6f2fcf8
								
							
								
							
						 | 
						
							
							
								
								【合成优化】魂印合成优化2
							
							
							
							
							
						 | 
						
							2021-02-03 16:09:07 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								505a5eaa66
								
							
								
							
						 | 
						
							
							
								
								主题活动提交
							
							
							
							
							
							
							
							(cherry picked from commit 74fd7a8839) 
							
						 | 
						
							2021-02-02 19:09:29 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								74fd7a8839
								
							
								
							
						 | 
						
							
							
								
								主题活动提交
							
							
							
							
							
						 | 
						
							2021-02-02 19:07:35 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								86042e99b5
								
							
								
							
						 | 
						
							
							
								
								主题活动
							
							
							
							
							
							
							
							(cherry picked from commit c3b8d1b59a) 
							
						 | 
						
							2021-02-02 18:49:34 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								ca1abfc0b5
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
							
							
							
							
							
						 | 
						
							2021-02-02 18:26:54 +08:00 | 
						
					
				
					
						
							
							
								 
								jiaoyangna
							
						 | 
						
							
							
							
							
								
							
								c3b8d1b59a
								
							
								
							
						 | 
						
							
							
								
								主题活动
							
							
							
							
							
						 | 
						
							2021-02-02 18:26:50 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								693dffe4a3
								
							
								
							
						 | 
						
							
							
								
								[战斗]==================126效果修改  生命百分比伤害会被无敌盾挡住
							
							
							
							
							
						 | 
						
							2021-02-02 15:38:59 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								bc1691891d
								
							
								
							
						 | 
						
							
							
								
								[战斗]==============禁疗显示血量 +0
							
							
							
							
							
						 | 
						
							2021-02-02 15:38:40 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								f699634c24
								
							
								
							
						 | 
						
							
							
								
								[战斗]==================126效果修改  生命百分比伤害会被无敌盾挡住
							
							
							
							
							
						 | 
						
							2021-02-02 15:02:25 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								f2ceeca55d
								
							
								
							
						 | 
						
							
							
								
								【本地化】服务器发送的错误消息未翻译修复
							
							
							
							
							
						 | 
						
							2021-02-01 19:50:38 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								d18c0fd8d4
								
							
								
							
						 | 
						
							
							
								
								[战斗]==============禁疗显示血量 +0
							
							
							
							
							
						 | 
						
							2021-02-01 19:15:19 +09:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								1a647499e0
								
							
								
							
						 | 
						
							
							
								
								【装备优化】优化装备数量的显示方式,扩充单件装备的堆叠上限
							
							
							
							
							
						 | 
						
							2021-02-01 17:58:02 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								c0cc27a470
								
							
								
							
						 | 
						
							
							
								
								【合成优化】魂印合成优化
							
							
							
							
							
						 | 
						
							2021-02-01 17:34:22 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								9c1c41c0fe
								
							
								
							
						 | 
						
							
							
								
								【战斗】===========被动294修改,添加免疫提示
							
							
							
							
							
						 | 
						
							2021-01-29 18:49:06 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								64ddcde464
								
							
								
							
						 | 
						
							
							
								
								【战斗】=======被动294修改
							
							
							
							
							
						 | 
						
							2021-01-29 17:29:36 +09:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								b3ac1b83c3
								
							
								
							
						 | 
						
							
							
								
								[战斗]==================被动119 ,294,305修改
							
							
							
							
							
						 | 
						
							2021-01-29 16:40:39 +09:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								ce0a7ed874
								
							
								
							
						 | 
						
							
							
								
								【本地化】界面显示优化
							
							
							
							
							
						 | 
						
							2021-01-29 14:09:52 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								bf3a6eb705
								
							
								
							
						 | 
						
							
							
								
								【本地化】界面显示问题修复
							
							
							
							
							
						 | 
						
							2021-01-29 13:34:16 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								2d1669246b
								
							
								
							
						 | 
						
							
							
								
								【战斗】===================选择两列逻辑修改提交
							
							
							
							
							
						 | 
						
							2021-01-28 20:24:50 +09:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								02504b0020
								
							
								
							
						 | 
						
							
							
								
								【限时兑换跳转】修复
							
							
							
							
							
						 | 
						
							2021-01-28 20:12:40 +08:00 | 
						
					
				
					
						
							
							
								 
								wangzhenxing
							
						 | 
						
							
							
							
							
								
							
								664d78d24d
								
							
								
							
						 | 
						
							
							
								
								[战斗]=============被动新增305 ,被动303,262修改,战斗逻辑修改:如果有技能在释放,不检测轮转
							
							
							
							
							
						 | 
						
							2021-01-28 20:08:43 +09:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7e582e0d57
								
							
								
							
						 | 
						
							
							
								
								【钱坤宝盒】描述需改
							
							
							
							
							
						 | 
						
							2021-01-28 17:51:44 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								0d50ff5f38
								
							
								
							
						 | 
						
							
							
								
								【钱坤宝盒】金色必出描述修改
							
							
							
							
							
						 | 
						
							2021-01-28 17:46:36 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								d6771be0cf
								
							
								
							
						 | 
						
							
							
								
								【本地化】修复青龙秘宝白片,优化gm界面显示,探宝商品名称改为读取物品表
							
							
							
							
							
						 | 
						
							2021-01-28 17:29:41 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								68a413c16c
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
							
							
							
							
							
						 | 
						
							2021-01-28 16:23:23 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								4c6105a265
								
							
								
							
						 | 
						
							
							
								
								【按钮优化】成长基金点击后按钮消失修复
							
							
							
							
							
						 | 
						
							2021-01-28 16:22:59 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								898ba31ad5
								
							
								
							
						 | 
						
							
							
								
								【本地化】修复大闹天宫瑶池资源本地化导致白片的问题
							
							
							
							
							
						 | 
						
							2021-01-28 16:19:11 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9559607b51
								
							
								
							
						 | 
						
							
							
								
								【本地化】部分扫光特效处理,充值界面妖精文字改图标
							
							
							
							
							
						 | 
						
							2021-01-28 15:37:44 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								ba6db73270
								
							
								
							
						 | 
						
							
							
								
								【NPC】去重
							
							
							
							
							
						 | 
						
							2021-01-28 15:27:37 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								0a9d0d2d05
								
							
								
							
						 | 
						
							
							
								
								【幸运探宝】在探宝界面过0点刷新,奖励不显示刷新后的物品
							
							
							
							
							
						 | 
						
							2021-01-28 15:06:25 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								392bd11ded
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
							
							
							
							
							
						 | 
						
							2021-01-28 15:03:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								6e56b2862c
								
							
								
							
						 | 
						
							
							
								
								【牛转钱坤】增加红点
							
							
							
							
							
						 | 
						
							2021-01-28 15:03:16 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a0a2ac324a
								
							
								
							
						 | 
						
							
							
								
								【NPC】优化
							
							
							
							
							
						 | 
						
							2021-01-28 14:48:57 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								852121b5e3
								
							
								
							
						 | 
						
							
							
								
								【抽卡动画】
							
							
							
							
							
						 | 
						
							2021-01-28 14:00:35 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9bc67febc2
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/本周版本优化内容' into 0功能/按钮优化
							
							
							
							
							
						 | 
						
							2021-01-28 13:41:06 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								bc9ff7be67
								
							
								
							
						 | 
						
							
							
								
								【按钮优化】报错修改
							
							
							
							
							
						 | 
						
							2021-01-28 13:39:50 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								2d5d0f0c10
								
							
								
							
						 | 
						
							
							
								
								【按钮优化】开服狂欢 百宝商会 升级好礼
							
							
							
							
							
						 | 
						
							2021-01-28 11:58:41 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								6f03f8cc9d
								
							
								
							
						 | 
						
							
							
								
								【抽卡动画 NPC】 提交
							
							
							
							
							
						 | 
						
							2021-01-28 11:55:26 +08:00 | 
						
					
				
					
						
							
							
								 
								gaoxin
							
						 | 
						
							
							
							
							
								
							
								9816db8f36
								
							
								
							
						 | 
						
							
							
								
								【本地化】错误修正,添加GM测试功能引导
							
							
							
							
							
						 | 
						
							2021-01-28 11:42:05 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								40e9640e82
								
							
								
							
						 | 
						
							
							
								
								抽卡动画提交
							
							
							
							
							
						 | 
						
							2021-01-28 11:36:23 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								20d5d99c42
								
							
								
							
						 | 
						
							
							
								
								【心魔试炼】达到最大关卡报错
							
							
							
							
							
						 | 
						
							2021-01-28 11:12:22 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								5d757400cc
								
							
								
							
						 | 
						
							
							
								
								【按钮优化】每日任务 青龙秘宝
							
							
							
							
							
						 | 
						
							2021-01-28 10:51:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								dbf91a5db4
								
							
								
							
						 | 
						
							
							
								
								【按钮优化】累计充值 主题任务 通关好礼
							
							
							
							
							
						 | 
						
							2021-01-28 10:19:38 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								3fed23cbe0
								
							
								
							
						 | 
						
							
							
								
								【按钮优化】限时商市 奇珍宝阁
							
							
							
							
							
						 | 
						
							2021-01-28 09:50:14 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								7cc06d1ef1
								
							
								
							
						 | 
						
							
							
								
								【按钮优化】周月礼包
							
							
							
							
							
						 | 
						
							2021-01-28 09:37:48 +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
							
						 | 
						
							
							
							
							
								
							
								bae3ec50cd
								
							
								
							
						 | 
						
							
							
								
								【优化】抽将动画可以点击跳过  2
							
							
							
							
							
						 | 
						
							2021-01-27 17:19:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								54e4b78be8
								
							
								
							
						 | 
						
							
							
								
								【牛转钱坤】抽奖时可以点击返回修改
							
							
							
							
							
						 | 
						
							2021-01-27 17:07:49 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								15fd0a36cd
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
							
							
							
							
							
						 | 
						
							2021-01-27 17:06:27 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								e332b75404
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
							
							
							
							
							
						 | 
						
							2021-01-27 17:05:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								9288003dd1
								
							
								
							
						 | 
						
							
							
								
								【牛转钱坤】【新将来袭】修改
							
							
							
							
							
						 | 
						
							2021-01-27 17:05:47 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								a126c4ca2a
								
							
								
							
						 | 
						
							
							
								
								Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
							
							
							
							
							
						 | 
						
							2021-01-27 16:40:53 +08:00 | 
						
					
				
					
						
							
							
								 
								zhangqiang
							
						 | 
						
							
							
							
							
								
							
								7b01f5fc07
								
							
								
							
						 | 
						
							
							
								
								【优化】主城假人改为NPC或者排行榜角色
							
							
							
							
							
						 | 
						
							2021-01-27 16:40:17 +08:00 | 
						
					
				
					
						
							
							
								 
								ZhangBiao
							
						 | 
						
							
							
							
							
								
							
								b3fc25de10
								
							
								
							
						 | 
						
							
							
								
								【按钮优化】七种达人 + 周卡 限时兑换
							
							
							
							
							
						 | 
						
							2021-01-27 16:36:36 +08:00 |