|  ZhangBiao | b0e53312e7 | 【心愿抽卡】增加英雄加入卡池的天数条件 | 2021-07-21 17:35:38 +08:00 | 
				
					
						|  jiaoyangna | 399d90809d | 装备详情弹窗下方获取途径位置显示错误 | 2021-07-21 17:32:07 +08:00 | 
				
					
						|  jiaoyangna | d1abaf403c | 装备详情弹窗下方获取途径位置显示错误 | 2021-07-21 17:23:14 +08:00 | 
				
					
						|  wangzhenxing | c3da0a2df8 | [乾坤宝盒]=============优化提交 | 2021-07-15 11:14:32 +08:00 | 
				
					
						|  wangzhenxing | e0d680da50 | [乾坤宝盒]=============功能提交 | 2021-07-14 18:20:04 +08:00 | 
				
					
						|  zhangqiang | 803fcee6bf | 【碎片图标】点击碎片图标弹出弹窗,再点击弹窗中图标,显示错误 | 2021-07-07 15:16:31 +08:00 | 
				
					
						|  jiaoyangna | 36cb3db3af | 底图修改提交 | 2021-06-30 16:17:50 +08:00 | 
				
					
						|  jiaoyangna | f834e2e17d | 【ID1009590】 【神将信息】增加神将获取途径来源预览功能 | 2021-06-30 10:12:44 +08:00 | 
				
					
						|  jiaoyangna | 37b7071ccf | 【ID1009590】 【神将信息】增加神将获取途径来源预览功能 | 2021-06-29 20:05:15 +08:00 | 
				
					
						|  ZhangBiao | 18d4289e39 | 【锻器阁】合成装备超框 | 2021-06-24 14:11:51 +08:00 | 
				
					
						|  jiaoyangna | cb37edbba0 | 秘宝间隔调整 | 2021-06-21 18:26:31 +08:00 | 
				
					
						|  jiaoyangna | 9275f0f011 | 字修改提交 | 2021-05-29 20:22:55 +08:00 | 
				
					
						|  jiaoyangna | 9eee295a1f | 价格修改提交 | 2021-05-29 20:17:50 +08:00 | 
				
					
						|  jiaoyangna | b78b006009 | 神将情报界面修改提交 | 2021-05-28 12:30:47 +08:00 | 
				
					
						|  wangzhenxing | 560089c1f5 | [限时祈愿活动] 预设 协议提交 | 2021-05-28 10:58:20 +08:00 | 
				
					
						|  zhangqiang | b92e659e53 | 【山河社稷图】特效提交 | 2021-05-27 20:17:53 +08:00 | 
				
					
						|  jiaoyangna | 1e247043ac | Merge branch '0优化/无尽副本' into china/dev-c # Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua | 2021-05-27 19:42:22 +08:00 | 
				
					
						|  jiaoyangna | 5dc0ea68ab | 无尽副本提交 | 2021-05-27 15:35:10 +08:00 | 
				
					
						|  zhangqiang | 397d24ee32 | 【山河社稷图】胜利条件显示增加 | 2021-05-27 14:40:34 +08:00 | 
				
					
						|  jiaoyangna | b197244667 | 无尽副本修改提交 | 2021-05-27 09:46:56 +08:00 | 
				
					
						|  jiaoyangna | 8f6fce191b | 无尽任务提交 | 2021-05-26 18:07:09 +08:00 | 
				
					
						|  jiaoyangna | c95211428b | Merge branch 'china/dev-c' into 0优化/无尽副本 # Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua | 2021-05-26 11:55:14 +08:00 | 
				
					
						|  ZhangBiao | 172f98c207 | 【修行】玩家界面预览报错修改 | 2021-05-26 11:28:59 +08:00 | 
				
					
						|  jiaoyangna | 911f443e40 | 添加属性提升 | 2021-05-26 09:51:41 +08:00 | 
				
					
						|  ZhangBiao | 41152acae9 | 【修行】排行榜界面,神将界面、神将替换提示调整 | 2021-05-25 11:54:19 +08:00 | 
				
					
						|  jiaoyangna | 33834cc9b2 | Merge branch 'china/dev-c' into 0功能/silingshilian # Conflicts:
#	Assets/ManagedResources/Atlas/FourElement.meta
#	Assets/ManagedResources/Atlas/FourElement/ArtFont/s_silingshilian_yitongguan_zh.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_daodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_di.jpg.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_fodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_rendi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_renjieshiliandi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shilianjianglidi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shoudi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_yaodi.png.meta
#	Assets/ManagedResources/LuaBytes.meta
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/View/ScrollCycleView.lua | 2021-05-24 16:39:34 +08:00 | 
				
					
						|  ZhangBiao | abcc89c68f | 【修行】选择神将从generalpopup到bigpopup | 2021-05-20 20:23:22 +08:00 | 
				
					
						|  ZhangBiao | 93b8746cfe | 【修行】玩家信息界面神印提交 | 2021-05-18 14:59:47 +08:00 | 
				
					
						|  zhangqiang | e763e54799 | Merge branch 'china/dev-c' into china_fightLevel # Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua | 2021-05-17 11:04:01 +08:00 | 
				
					
						|  ZhangBiao | f3cb51c858 | 【预设冲突】冲突修改后提交 | 2021-05-17 10:35:58 +08:00 | 
				
					
						|  ZhangBiao | 8003c43f71 | Merge branch 'china/dev-c' into 0功能/修行玩法 | 2021-05-17 10:32:30 +08:00 | 
				
					
						|  ZhangBiao | 307c2c1e37 | 【冲突处理】复制general(big)popup | 2021-05-17 10:31:45 +08:00 | 
				
					
						|  ZhangBiao | 29b8fd144e | Revert "【修行】提交,预设冲突处理" This reverts commit 79910218c5. | 2021-05-17 10:29:34 +08:00 | 
				
					
						|  ZhangBiao | 79910218c5 | 【修行】提交,预设冲突处理 | 2021-05-17 10:21:08 +08:00 | 
				
					
						|  ZhangBiao | 3229d0693b | 【修行】提交 | 2021-05-14 13:21:38 +08:00 | 
				
					
						|  ZhangBiao | 4b20254ddd | 【修行】提交 | 2021-05-13 21:03:27 +08:00 | 
				
					
						|  zhangqiang | e4eda3017e | 【山河社稷图】提交 | 2021-05-13 20:30:10 +08:00 | 
				
					
						|  zhangqiang | da33b98dfb | 【山河社稷图】提交 | 2021-05-13 09:56:11 +08:00 | 
				
					
						|  jiaoyangna | 3c04e8dbe1 | [主题活动修改提交] (cherry picked from commit f88ccd8f68) | 2021-05-12 17:37:59 +08:00 | 
				
					
						|  gaoxin | 58618e2062 | 【帮助】修复界面可以穿透点击事件的问题 | 2021-05-11 11:06:41 +08:00 | 
				
					
						|  ZhangBiao | 16e5b894e3 | 【天尊降世】增加第三个奖励红点 | 2021-05-10 10:35:08 +08:00 | 
				
					
						|  jiaoyangna | 08ef62eb2b | 至尊降世    前往修改 | 2021-04-30 12:42:31 +08:00 | 
				
					
						|  gaoxin | 0b260fd03a | 【资源】至尊降世资源修改 | 2021-04-29 20:48:39 +08:00 | 
				
					
						|  gaoxin | 7bae49b1c2 | 【至尊降世】特效修改 | 2021-04-29 17:53:40 +08:00 | 
				
					
						|  ZhangBiao | ba024be162 | 【踏碎凌霄】已未达成提交 | 2021-04-27 23:37:11 +08:00 | 
				
					
						|  wangzhenxing | 520e5de224 | 天尊降世预设修改 | 2021-04-27 22:48:02 +08:00 | 
				
					
						|  wangzhenxing | 137196f197 | 天尊降世预设提交 | 2021-04-27 22:41:56 +08:00 | 
				
					
						|  wangzhenxing | d2a7fdcee1 | 天尊降世活动资源提交 | 2021-04-27 22:16:42 +08:00 | 
				
					
						|  ZhangBiao | 833473f334 | 【踏碎凌霄】恭喜获得无奖励提示 | 2021-04-27 20:35:27 +08:00 | 
				
					
						|  ZhangBiao | c24e7504cb | 【恭喜获得】点击面板也可关闭 | 2021-04-27 20:03:37 +08:00 | 
				
					
						|  ZhangBiao | 74b2ef62ca | 【恭喜获得】提交 | 2021-04-27 13:48:17 +08:00 | 
				
					
						|  ZhangBiao | 072b7713c2 | 【恭喜获得】界面结构调整 | 2021-04-25 17:40:49 +08:00 | 
				
					
						|  ZhangBiao | 39329ce5cc | 【踏碎凌霄提交】 | 2021-04-25 15:07:36 +08:00 | 
				
					
						|  ZhangBiao | 6a0a230eb6 | 【踏碎凌霄】 | 2021-04-23 19:37:15 +08:00 | 
				
					
						|  ZhangBiao | 8e76fc3e5d | 【云游商人】提交 | 2021-04-21 20:24:06 +08:00 | 
				
					
						|  ZhangBiao | 24a8cbe9b0 | Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼 # Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset | 2021-04-19 20:12:51 +08:00 | 
				
					
						|  zhangqiang | 46efdd02de | 【英雄升星祭品】提交——02 | 2021-04-19 15:11:39 +08:00 | 
				
					
						|  ZhangBiao | 3005d9bf30 | 【云游商人】提交 | 2021-04-19 11:38:35 +08:00 | 
				
					
						|  gaoxin | 839a9e4d1d | Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev | 2021-04-12 17:03:11 +08:00 | 
				
					
						|  wangzhenxing | 443ba942cf | [功能]================称号功能提交 | 2021-04-12 16:23:57 +08:00 | 
				
					
						|  ZhangBiao | 5814ca39db | 【青龙秘宝】文字超框修改 | 2021-04-09 16:51:49 +08:00 | 
				
					
						|  ZhangBiao | 6117dd2363 | 【牛气冲天】翻译修改 | 2021-04-07 16:59:47 +08:00 | 
				
					
						|  ZhangBiao | 3a23cb6cae | 【青龙秘宝】解锁秘宝特权时,可直接领取的奖励显示区域超框 | 2021-03-30 22:09:25 +08:00 | 
				
					
						|  zhangqiang | 9faf244e40 | 【归元修改】 神将 法宝 归元修改 | 2021-03-30 16:36:00 +08:00 | 
				
					
						|  ZhangBiao | 289af5b209 | 【活动优化】青龙秘宝界面优化 | 2021-03-30 14:34:25 +08:00 | 
				
					
						|  gaoxin | fd5ef82b5f | 【公会】修复援助界面在全面屏下显示错误,修复援助记录不显示的问题 | 2021-03-26 10:13:05 +08:00 | 
				
					
						|  gaoxin | a01f1024ec | 【优化】挂机奖励提升内容位置调整 | 2021-03-18 13:47:03 +08:00 | 
				
					
						|  jiaoyangna | 98e2ad0e3b | 【美元显示】解锁青龙秘宝 | 2021-03-18 09:56:02 +08:00 | 
				
					
						|  jiaoyangna | e27057ed9c | 预设提交 | 2021-03-12 14:41:56 +08:00 | 
				
					
						|  jiaoyangna | 6899e700de | 白片修改。神应解锁界面修改提交 | 2021-03-11 15:33:18 +08:00 | 
				
					
						|  jiaoyangna | 6b5b1f934e | Merge branch '0功能/silingshilian' of http://60.1.1.230/gaoxin/JL_Client into 0功能/silingshilian | 2021-03-10 17:31:58 +08:00 | 
				
					
						|  jiaoyangna | a7353213aa | 四灵提交 | 2021-03-10 17:31:40 +08:00 | 
				
					
						|  ZhangBiao | 891dd5ca5b | 【建木神树】 | 2021-03-10 15:01:18 +08:00 | 
				
					
						|  jiaoyangna | 77391886e3 | 四灵修改提交 | 2021-03-09 17:22:42 +08:00 | 
				
					
						|  jiaoyangna | e33cabd49e | 删除多余的预设 | 2021-03-08 15:07:33 +08:00 | 
				
					
						|  jiaoyangna | 73ef0db2dc | 预设提交 | 2021-03-08 15:03:11 +08:00 | 
				
					
						|  jiaoyangna | 49c527a9bb | 装备界面提交 | 2021-03-08 14:20:27 +08:00 | 
				
					
						|  jiaoyangna | 1a6700d3a8 | 预设提交 | 2021-03-08 14:03:55 +08:00 | 
				
					
						|  jiaoyangna | dc0a2283d8 | 预设提交 | 2021-03-08 13:58:43 +08:00 | 
				
					
						|  jiaoyangna | 4c390cf272 | 预设修改提交 | 2021-03-08 13:51:39 +08:00 | 
				
					
						|  jiaoyangna | 555657dca7 | Merge branch '0功能/silingshilian' of http://60.1.1.230/gaoxin/JL_Client into 0功能/silingshilian | 2021-03-08 11:23:33 +08:00 | 
				
					
						|  jiaoyangna | 9a946d5777 | 四灵试炼分支预设提交 | 2021-03-08 11:22:35 +08:00 | 
				
					
						|  jiaoyangna | cf3c571182 | Merge branch 'master_xma_local' into 0功能/silingshilian # Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua | 2021-03-08 11:14:15 +08:00 | 
				
					
						|  jiaoyangna | 02ca65089f | Merge branch 'master_xma_local' into 0功能/silingshilian # Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Harmony.meta
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua | 2021-03-08 10:27:14 +08:00 | 
				
					
						|  gaoxin | e874afa2ea | 【本地化】十绝阵结算还是会重叠 | 2021-03-07 18:00:12 +08:00 | 
				
					
						|  gaoxin | f8dc9552c9 | 【本地化】十绝阵结算伤害文字重叠 | 2021-03-07 17:43:04 +08:00 | 
				
					
						|  jiaoyangna | bf45224c5f | 升级修改提交 | 2021-03-05 18:33:46 +08:00 | 
				
					
						|  jiaoyangna | 91f1fefe1a | 本地化提交 | 2021-03-05 16:06:51 +08:00 | 
				
					
						|  jiaoyangna | 6a777d71c6 | 十绝阵文字重叠提交 | 2021-03-05 11:58:29 +08:00 | 
				
					
						|  jiaoyangna | 29f1ae90e0 | 预设提交 | 2021-03-04 21:33:19 +08:00 | 
				
					
						|  ZhangBiao | c7ab8fcb8b | 【本地化】 | 2021-03-03 18:07:29 +08:00 | 
				
					
						|  ZhangBiao | f01cdd582e | Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev | 2021-03-03 17:04:26 +08:00 | 
				
					
						|  ZhangBiao | 6fe7b9ed28 | 【本地化】 | 2021-03-03 17:04:17 +08:00 | 
				
					
						|  zhangqiang | 59c2caaede | 【送神祠本地化修改】 | 2021-03-03 15:51:04 +08:00 | 
				
					
						|  ZhangBiao | aef41d8157 | 【本地化】 | 2021-03-01 16:18:34 +08:00 | 
				
					
						|  zhangqiang | 7a7196f93a | 【越南语】修改 | 2021-02-27 15:42:50 +08:00 | 
				
					
						|  jiaoyangna | 3f38b704be | 已修改 | 2021-02-26 10:32:02 +08:00 | 
				
					
						|  gaoxin | c6430f59a5 | 【本地化】乾坤宝盒界面相关修改 | 2021-02-25 17:31:26 +08:00 | 
				
					
						|  jiaoyangna | 0e80a3ee5a | 玩家信息界面修改 | 2021-02-25 15:28:08 +08:00 | 
				
					
						|  jiaoyangna | fc28bb9e35 | Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev # Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab | 2021-02-25 14:20:51 +08:00 | 
				
					
						|  jiaoyangna | df38aea68e | 巅峰赛修改 | 2021-02-25 14:20:29 +08:00 | 
				
					
						|  jiaoyangna | c3c1f6abf9 | 去掉颜色显隐 | 2021-02-25 14:19:45 +08:00 | 
				
					
						|  ZhangBiao | b2dbdfe599 | 【本地化】page12 14 jumpview | 2021-02-25 13:31:27 +08:00 | 
				
					
						|  ZhangBiao | 58d0b7874f | 【本地化】 | 2021-02-24 20:57:28 +08:00 | 
				
					
						|  jiaoyangna | dc68abaf55 | 大闹天宫 | 2021-02-24 20:25:29 +08:00 | 
				
					
						|  ZhangBiao | 42d6c9e8b9 | Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev | 2021-02-24 18:17:54 +08:00 | 
				
					
						|  ZhangBiao | f8bc361605 | 【本地化】首充 四元阵 | 2021-02-24 18:17:46 +08:00 | 
				
					
						|  jiaoyangna | e9d02d8006 | 天尊降世修改 | 2021-02-24 18:07:44 +08:00 | 
				
					
						|  jiaoyangna | e42193d264 | 轩辕,森罗修改 | 2021-02-24 17:37:56 +08:00 | 
				
					
						|  jiaoyangna | fd2626bfb1 | 青龙秘宝修改 | 2021-02-24 15:41:23 +08:00 | 
				
					
						|  ZhangBiao | 74185b0d1b | 【本地化】 | 2021-02-24 11:23:53 +08:00 | 
				
					
						|  jiaoyangna | 6a0dc005eb | 公会技能重置修改 | 2021-02-24 10:23:15 +08:00 | 
				
					
						|  jiaoyangna | fc75b356b0 | 公会修改 | 2021-02-24 10:21:44 +08:00 | 
				
					
						|  ZhangBiao | 91f46cb250 | 【本地化】森罗幻境修改 | 2021-02-24 09:48:22 +08:00 | 
				
					
						|  jiaoyangna | 576400a914 | 公会商店本地化修改提交 | 2021-02-23 20:50:34 +08:00 | 
				
					
						|  ZhangBiao | 64e2464cf9 | 【本地化】预设位置调整 | 2021-02-23 17:04:52 +08:00 | 
				
					
						|  jiaoyangna | 45549c8a6d | 回放修改 | 2021-02-22 18:51:41 +08:00 | 
				
					
						|  jiaoyangna | 6d1d7c7996 | 战斗回放类型修改 | 2021-02-22 18:42:26 +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 | 3b7ff95aaf | 属性图标修改提交 | 2021-02-19 18:18:09 +08:00 | 
				
					
						|  gaoxin | 19ea17f6b2 | 【本地化】胜利界面本地化修改 | 2021-02-04 10:25:55 +08:00 | 
				
					
						|  jiaoyangna | c8a2308b00 | 四灵协议提交 | 2021-02-03 18:40:26 +08:00 | 
				
					
						|  gaoxin | 19d241f44e | 【本地化】优化显示错误 | 2021-02-01 19:33:03 +08:00 | 
				
					
						|  gaoxin | ce0a7ed874 | 【本地化】界面显示优化 | 2021-01-29 14:09:52 +08:00 | 
				
					
						|  gaoxin | 9816db8f36 | 【本地化】错误修正,添加GM测试功能引导 | 2021-01-28 11:42:05 +08:00 | 
				
					
						|  gaoxin | 12356f5ed7 | 【本地化】预设提交 | 2021-01-26 17:48:24 +08:00 | 
				
					
						|  jiaoyangna | 01a265cdc3 | 预设提交 | 2021-01-26 16:42:52 +08:00 | 
				
					
						|  ZhangBiao | 0e437c7093 | 【建木神树】预设提交 | 2021-01-26 15:55:50 +08:00 | 
				
					
						|  jiaoyangna | 8e0047d5e8 | Merge branch 'master_xma_local' into 0功能/silingshilian # Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua | 2021-01-26 14:48:06 +08:00 | 
				
					
						|  jiaoyangna | 3a7324883e | 【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励 | 2021-01-14 15:24:51 +08:00 | 
				
					
						|  jiaoyangna | be993c9905 | 【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励 | 2021-01-12 19:21:20 +08:00 | 
				
					
						|  jiaoyangna | a5a93d43a7 | 【ID1007787】 【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励 | 2021-01-07 19:24:04 +08:00 | 
				
					
						|  zhangqiang | 7bedefc780 | 【战斗回放】 | 2021-01-06 16:12:54 +08:00 | 
				
					
						|  jiaoyangna | c1c15d6c8b | 四灵试炼 | 2021-01-04 11:39:58 +08:00 | 
				
					
						|  zhangqiang | 694320d99c | Merge branch '0功能/1月6_版本优化' into master_develop # Conflicts:
#	Assets/Effect_ls_08_jinwu_attack_02.controller.meta
#	Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi/ArtFont.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_banner.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_zi.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_banner.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon1.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon2.png.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation/GameObject 7.controller.meta
#	Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture.meta
#	Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller
#	Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller.meta
#	Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/Language.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	FontArt/ArtFont_zh/s_shengxingyouli_anniu_01_zh.png
#	FontArt/ArtFont_zh/s_shengxingyouli_anniu_02_zh.png
#	FontArt/中英文不一致资源/zh/s_shengxingyouli_banner_zh.png | 2020-12-31 14:53:17 +08:00 | 
				
					
						|  zhangqiang | 0a2b4f3c3e | 【漏提】 | 2020-12-30 18:25:48 +08:00 | 
				
					
						|  jiaoyangna | 0e8811df2b | 【优化】背包中使用多个道具,明确标注数量 | 2020-12-30 11:02:44 +08:00 | 
				
					
						|  jiaoyangna | a8bcdf14f4 | 【优化】道具不能使用0个,且优化道具使用多个的上限(目前20过少) | 2020-12-28 20:10:45 +08:00 | 
				
					
						|  gaoxin | 1171415e74 | 【技能Tip】修复大小不能自适应文字的问题 | 2020-12-26 18:34:08 +08:00 | 
				
					
						|  jiaoyangna | c4a0cab9a8 | Merge branch '0功能/建木神树' into 0功能/silingshilian # Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua | 2020-12-21 10:46:53 +08:00 | 
				
					
						|  ZhangBiao | 45b8899cfe | 【建木神树】排行榜查看其他人信息 | 2020-12-16 13:49:56 +08:00 | 
				
					
						|  ZhangBiao | 0b6c8362b6 | 【建木神树】提交 | 2020-12-15 17:27:16 +08:00 | 
				
					
						|  jiaoyangna | 4519f70c54 | 四灵试炼commit | 2020-12-14 09:54:50 +08:00 | 
				
					
						|  jiaoyangna | 26c6fa1894 | [四灵试炼] 预设代码提交 | 2020-12-10 16:23:13 +08:00 | 
				
					
						|  jiaoyangna | 8b7a227a54 | 【四灵试炼】预设提交 | 2020-12-08 17:01:53 +08:00 | 
				
					
						|  ZhangBiao | 8a5d51e2a3 | 【灵兽抽卡】增加可选灵兽 (cherry picked from commit 8185be7c27) | 2020-11-13 12:12:44 +08:00 | 
				
					
						|  ZhangBiao | 9ca403ebff | 【易经宝库】第三层抽取完成后bug修复 | 2020-11-09 11:09:42 +08:00 | 
				
					
						|  ZhangBiao | 5e130a7585 | Merge branch '0活动开发聚集地/易经宝库' into master_xma_local # Conflicts:
#	Assets/ManagedResources/EffectResSkill/Effect_c_swk_00015_s1/Materials.meta
#	Assets/ManagedResources/EffectResUI/YiJingBaoKu/Materials.meta
#	Assets/ManagedResources/Effects/Model/Materials.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua | 2020-11-06 16:17:12 +08:00 | 
				
					
						|  ZhangBiao | b516a8c202 | 【易经宝库】没有QA 无法购买 | 2020-11-06 13:36:48 +08:00 | 
				
					
						|  ZhangBiao | 6f75850ae4 | 【易经宝库】提交 | 2020-11-05 19:10:20 +08:00 |