Commit Graph

1113 Commits (9aa87b54e2e0eb61522bb4bd567c9bc0c0b609d1)

Author SHA1 Message Date
gaoxin 7ea798b693 【本地化】部分活动介绍界面内容改为可滑动 2021-02-25 15:38:27 +08:00
jiaoyangna 0e80a3ee5a 玩家信息界面修改 2021-02-25 15:28:08 +08:00
jiaoyangna ee5e5777f3 社稷大点, 活动任务提交 2021-02-25 15:20:49 +08:00
jiaoyangna db9f456676 没有翻译图片显示中文 2021-02-25 15:10:44 +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 9a54660c1f 【本地化】降妖夺宝 新将来袭 2021-02-25 11:24:43 +08:00
ZhangBiao 468731dc53 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 11:17:10 +08:00
ZhangBiao 1c52db19b6 【本地化】page 2 10 12 13 mainshop 2021-02-25 11:17:00 +08:00
jiaoyangna e953005b6e 活动排行 灵兽抽卡 修改 2021-02-25 10:41:07 +08:00
jiaoyangna 9cd02c5063 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 21:03:40 +08:00
jiaoyangna dd3e202ae3 图片提交 2021-02-24 21:03:36 +08:00
ZhangBiao 58d0b7874f 【本地化】 2021-02-24 20:57:28 +08:00
ZhangBiao 83306455e9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 20:56:28 +08:00
ZhangBiao 61b22edef5 【本地化】提交 2021-02-24 20:56:01 +08:00
jiaoyangna 10759be394 大闹天宫提交 2021-02-24 20:32:54 +08:00
jiaoyangna 19a743a74b Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 20:25:40 +08:00
jiaoyangna dc68abaf55 大闹天宫 2021-02-24 20:25:29 +08:00
ZhangBiao 180ad3ab31 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 20:25:08 +08:00
ZhangBiao 5834e08ee2 【本地化】提交 2021-02-24 20:24:58 +08:00
jiaoyangna b6f00fd4e8 车迟提交 2021-02-24 19:55:50 +08:00
jiaoyangna affb12060a 心魔 修改提交 2021-02-24 18:27:53 +08:00
jiaoyangna ba8c822b3f Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 18:23:50 +08:00
jiaoyangna a34bd942bf 极速探索提交 2021-02-24 18:23:40 +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 d403acaf58 等级礼包修改提交 2021-02-24 18:13:55 +08:00
jiaoyangna e9d02d8006 天尊降世修改 2021-02-24 18:07:44 +08:00
jiaoyangna ee8a721624 灵兽抽卡修改 2021-02-24 18:00:19 +08:00
jiaoyangna 48c959e302 森罗左下角修改 2021-02-24 17:40:35 +08:00
jiaoyangna e52b646c3a Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 17:38:12 +08:00
jiaoyangna e42193d264 轩辕,森罗修改 2021-02-24 17:37:56 +08:00
ZhangBiao 5c5704cdf1 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 17:36:35 +08:00
ZhangBiao 16a4fa4dde 【本地化】灵兽界面 福利界面 2021-02-24 17:36:24 +08:00
jiaoyangna fd2626bfb1 青龙秘宝修改 2021-02-24 15:41:23 +08:00
jiaoyangna ab27a768cf 青龙秘宝修改 2021-02-24 15:37:17 +08:00
jiaoyangna 4b05af8b04 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 15:14:12 +08:00
jiaoyangna d65037420c 排行榜提交 2021-02-24 15:13:57 +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
jiaoyangna aae09643f0 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 14:52:28 +08:00
jiaoyangna 08cafc0ce9 限时活动,活动排行 修改 2021-02-24 14:52:18 +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
jiaoyangna 0e1495adcb Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 12:04:49 +08:00
jiaoyangna 5088768f6c 探宝修改 2021-02-24 12:04:39 +08:00
jiaoyangna abf4322b79 幸运探宝修改 2021-02-24 12:02:36 +08:00
ZhangBiao 7338db75ad Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 11:47:15 +08:00
ZhangBiao fc7879a56a 【本地化】我要变强 首充 2021-02-24 11:47:07 +08:00
jiaoyangna d7bee8c711 十绝阵奖励修改 2021-02-24 11:46:07 +08:00
jiaoyangna 73e973824d vip 提交 2021-02-24 11:39:00 +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 45a4b740d2 红包修改提交 2021-02-24 11:15:03 +08:00
jiaoyangna 22dcb8c487 公会红包修改 2021-02-24 10:44:00 +08:00
jiaoyangna 6a0dc005eb 公会技能重置修改 2021-02-24 10:23:15 +08:00
jiaoyangna fc75b356b0 公会修改 2021-02-24 10:21:44 +08:00
ZhangBiao 8e0b99ba8b Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 10:04:36 +08:00
ZhangBiao 29aa15c12f 【本地化】灵兽界面调整 2021-02-24 10:04:28 +08:00
jiaoyangna de3cc09086 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-24 09:54:25 +08:00
jiaoyangna 71c86423ac 十绝阵提交 2021-02-24 09:54:21 +08:00
ZhangBiao 91f46cb250 【本地化】森罗幻境修改 2021-02-24 09:48:22 +08:00
zhangqiang 497729e762 【优化】查找合成的时候英雄名字查找困难 英雄名字放在主页上 2021-02-23 20:50:56 +08:00
jiaoyangna 576400a914 公会商店本地化修改提交 2021-02-23 20:50:34 +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 7fbcd27b69 日常任务界面页签修改 2021-02-23 17:41:50 +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
ZhangBiao f8537fb048 【本地化】英雄装备 魂印界面修改 2021-02-23 15:33:24 +08:00
ZhangBiao 3674cdd886 【本地化】神将装备界面调整 2021-02-23 14:57:04 +08:00
ZhangBiao bec4de4ae2 【本地化】英雄界面下方页签调整 2021-02-23 14:20:39 +08:00
jiaoyangna 6eb45cd1e6 预设白片提交 2021-02-23 10:51:52 +08:00
jiaoyangna 2044d5c903 主城提交 2021-02-23 09:51:37 +08:00
jiaoyangna c4883087a5 lua 提交 2021-02-22 16:35:25 +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 bb6e7c47a2 皮肤界面修改提交 2021-02-20 15:35:31 +08:00
jiaoyangna f0485649ab 预设修改提交 2021-02-20 14:40:01 +08:00
jiaoyangna 3b7ff95aaf 属性图标修改提交 2021-02-19 18:18:09 +08:00
ZhangBiao bc5410db23 【神衣天降】UI调整 2021-02-19 11:17:24 +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 ce17741169 【大闹天宫】界面微调 2021-02-18 18:31:30 +08:00
zhangqiang 2b25d19602 【资源导入】 2021-02-18 17:59:43 +08:00
jiaoyangna f15fa6f1f9 越南语图片提交 2021-02-18 17:21:14 +08:00
zhangqiang aa40bb1775 【资源提交】 立绘 c_gyps_00020_s1 + 技能特效 Effect_tiannv 2021-02-18 17:06:24 +08:00
zhangqiang 748060a839 【魂印合成】 合成选择界面名字位置调高 2021-02-18 15:37:11 +08:00
zhangqiang 55c8fd1ec6 【编队】编队界面,点击第三排头像,底部点击没反应 2021-02-05 17:24:13 +08: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 2c5c7a5b78 【本地化】限时折扣界面背景全屏显示 2021-02-04 11:32:15 +08:00
gaoxin 41f1818609 【本地化】修复中文等级提升界面显示了英文的问题 2021-02-04 10:32:08 +08:00
gaoxin 19ea17f6b2 【本地化】胜利界面本地化修改 2021-02-04 10:25:55 +08:00
gaoxin 51bdf1055e 【本地化】公会名称,宣言修改界面文字显示重叠问题修复 2021-02-04 10:15:48 +08:00
gaoxin 19d241f44e 【本地化】优化显示错误 2021-02-01 19:33:03 +08:00
jiaoyangna 21ecb784d8 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-01-29 18:52:55 +08:00
jiaoyangna 5d1420ff90 逍遥游特效修改提交 2021-01-29 18:52:46 +08:00
DESKTOP-98AVA47\Administrator f0e2df5aed 【本地化】 2021-01-29 14:36:50 +08:00
gaoxin 47e7f645eb 【本地化】竞技场显示优化 2021-01-29 14:27:33 +08:00
gaoxin ce0a7ed874 【本地化】界面显示优化 2021-01-29 14:09:52 +08:00
DESKTOP-98AVA47\Administrator 356068f4cb Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-01-29 13:56:29 +08:00
DESKTOP-98AVA47\Administrator 531592ae3d 【本地化】 2021-01-29 13:55:55 +08:00
gaoxin bf3a6eb705 【本地化】界面显示问题修复 2021-01-29 13:34:16 +08:00
DESKTOP-98AVA47\Administrator 839dd3b343 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-01-29 12:29:49 +08:00
DESKTOP-98AVA47\Administrator 3878baa2eb 【本地化】鸿蒙结果文字位置 兽潮排行层数文字 2021-01-29 12:28:16 +08:00
DESKTOP-98AVA47\Administrator 8d2aeb2f0a 【本地化】十绝阵奖励上方文字 2021-01-29 11:26:22 +08:00
ZhangBiao 0d50ff5f38 【钱坤宝盒】金色必出描述修改 2021-01-28 17:46:36 +08:00
gaoxin d6771be0cf 【本地化】修复青龙秘宝白片,优化gm界面显示,探宝商品名称改为读取物品表 2021-01-28 17:29:41 +08:00
yuanshuai b086c4cf41 自动游历功能屏蔽 2021-01-28 16:21:47 +08:00
gaoxin f2377abd08 【本地化】好友页签显示本地化适配 2021-01-28 16:19:42 +08:00
gaoxin 9559607b51 【本地化】部分扫光特效处理,充值界面妖精文字改图标 2021-01-28 15:37:44 +08:00
ZhangBiao 9bc67febc2 Merge branch '0功能/本周版本优化内容' into 0功能/按钮优化 2021-01-28 13:41:06 +08:00
ZhangBiao 2d5d0f0c10 【按钮优化】开服狂欢 百宝商会 升级好礼 2021-01-28 11:58:41 +08:00
gaoxin 9816db8f36 【本地化】错误修正,添加GM测试功能引导 2021-01-28 11:42:05 +08:00
ZhangBiao 5d757400cc 【按钮优化】每日任务 青龙秘宝 2021-01-28 10:51:38 +08:00
ZhangBiao dbf91a5db4 【按钮优化】累计充值 主题任务 通关好礼 2021-01-28 10:19:38 +08:00
ZhangBiao 7cc06d1ef1 【按钮优化】周月礼包 2021-01-28 09:37:48 +08:00
gaoxin 48ffaf2470 【本地化】预设文字导出 2021-01-27 18:17:32 +08:00
ZhangBiao b3fc25de10 【按钮优化】七种达人 + 周卡 限时兑换 2021-01-27 16:36:36 +08:00
ZhangBiao 8901e7d4e6 【按钮优化】充值 积天豪礼 2021-01-27 16:12:39 +08:00
gaoxin 4ef9c154ab 【本地化】背包界面物品可合成时白片问题修复 2021-01-27 14:29:11 +08:00
gaoxin e0788a63ce 【本地化】资源同步 2021-01-27 13:49:15 +08:00
ZhangBiao a6911749d2 Merge branch '0活动开发聚集地/牛转乾坤' into 0功能/本周版本优化内容 2021-01-27 13:41:56 +08:00
ZhangBiao 7b686298c8 【按钮优化】充值界面 2021-01-27 10:02:58 +08:00
zhangqiang 571a69888a 【优化】抽将动画可以点击跳过 2021-01-26 18:52:03 +08:00
gaoxin 12356f5ed7 【本地化】预设提交 2021-01-26 17:48:24 +08:00
ZhangBiao 3254df8f6f 【降妖夺宝】预设补提 2021-01-26 17:26:08 +08:00
ZhangBiao 560b5557f7 【牛转乾坤】扫光特效修改 2021-01-26 14:04:13 +08:00
ZhangBiao 78bc7e8ab3 Merge branch '0功能/本周版本优化内容' into 0活动开发聚集地/牛转乾坤 2021-01-26 13:49:08 +08:00
ZhangBiao 0651220248 【牛转乾坤】特效提交 2021-01-26 13:47:30 +08:00
zhangqiang a2ed23dd24 Revert "tips loading tijiao"
This reverts commit 27066d7033.
2021-01-26 11:00:12 +08:00
jiaoyangna 22aee8fe41 tips loading tijiao 2021-01-26 10:59:32 +08:00
jiaoyangna 27066d7033 tips loading tijiao 2021-01-25 18:10:14 +08:00
guowei 13cafd1364 【预设修改】 2021-01-25 16:45:49 +08:00
jiaoyangna 4ec73a4a8d 召唤,抽取,招募 文字修改 2021-01-22 15:52:02 +08:00
ZhangBiao 9e14cada49 【牛转钱坤】完事了 2021-01-21 15:10:27 +08:00
zhangqiang fc167398d6 【神将】神将上限999,继续通过碎片合成会导致游戏崩溃 2021-01-21 11:10:29 +08:00
ZhangBiao 20857d4e27 【牛转钱坤】差不多完事了 2021-01-20 18:27:23 +08:00
ZhangBiao 0146bc8512 【牛转钱坤】代码提交 2021-01-20 15:31:39 +08:00
ZhangBiao 158bf92955 【牛转乾坤】资源提交 2021-01-20 14:52:12 +08:00
guowei d85cb48f6d 【鸿蒙阵缺陷修改】 2021-01-20 10:37:02 +08:00
zhangqiang 9a50a111c7 【资源导入】 白骨精皮肤例会 观音例会替换 2021-01-19 14:31:01 +08:00
gaoxin ceb9e39b00 【战斗统计】第二版 2021-01-16 16:23:06 +08:00
gaoxin 6f386e1b52 【战斗统计】第一版 2021-01-16 16:22:57 +08:00
DESKTOP-98AVA47\Administrator 8f437f407d 【本周优化修改】 2021-01-15 22:11:38 +08:00
guowei b42a1c8e61 【鸿蒙阵修改】 2021-01-14 21:11:53 +08:00
jiaoyangna f0a58a5882 【ID1007696】
【优化】逍遥游移动时头顶出现金币的奖励特效
2021-01-14 15:42:21 +08:00
jiaoyangna 3a7324883e 【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励 2021-01-14 15:24:51 +08:00
guowei 3f8312953e Merge branch 'master_xma_local' into 0功能/鸿蒙门阵 2021-01-14 10:20:12 +08:00
jiaoyangna 5e90700036 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-01-13 14:30:00 +08:00
jiaoyangna 687c5fa957 红点提交 2021-01-13 14:29:56 +08:00
zhangqiang 97970275e1 通天教主live2d修改 2021-01-13 11:29:18 +08:00
ZhangBiao 716ae8cdb7 【观音】live2d提交 2021-01-13 10:28:38 +08:00
jiaoyangna be993c9905 【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励 2021-01-12 19:21:20 +08:00
ZhangBiao 1c78654a42 【ID1007750】【优化】青龙秘宝优化
(cherry picked from commit 02d655c394847de7f02bee6345b37988767d8f6e)
2021-01-12 10:14:18 +08:00
ZhangBiao 8cdbef0e70 【ID1007750】【优化】青龙秘宝优化
(cherry picked from commit fdcf53d59dbce0d6c7045dbdc81200a3335ccee9)
2021-01-12 10:14:09 +08:00
guowei 7aac4cbd32 【1/11鸿蒙阵bug修改】 2021-01-11 21:04:12 +08:00
zhangqiang bd6ba2fa29 【资源导入】 通天教主 live2d and 攻击特效 2021-01-11 15:08:53 +08:00
guowei 372b74eb05 【鸿蒙阵补齐资源】 2021-01-11 11:03:06 +08:00
gaoxin 6c1a801779 Merge remote-tracking branch 'origin/gx/test_new' into master_xma_local 2021-01-09 13:54:01 +08:00
zhangqiang 43bd986273 Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2021-01-08 19:31:36 +08:00
ZhangBiao 5bbd58c517 【公会援助】5点改12点文字修改 2021-01-08 19:30:29 +08:00
zhangqiang d650e2f18c Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local 2021-01-08 19:25:31 +08:00
ZhangBiao 97141341db 【车迟斗法】boss位置调整2 2021-01-08 19:25:03 +08:00
zhangqiang f6c9456b8c 【资源导入】 灵兽 金乌 live2d and 三个音效 2021-01-08 19:24:00 +08:00
zhangqiang 9f9b2920e3 【战斗回放】 2021-01-08 19:19:01 +08:00
ZhangBiao 657fe80519 【工会祭祀】提示文字 5点改0点 2021-01-08 19:16:48 +08:00
ZhangBiao 49a0424ba0 【车迟斗法】boss位置调整2 2021-01-08 17:22:38 +08:00
jiaoyangna 63448b9f1a Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-01-08 15:49:28 +08:00
zhangqiang 6f87cf04a8 【资源导入】 灵兽 金乌 live2d and 三个音效 2021-01-08 15:21:24 +08:00
guowei f28818d4aa 【鸿蒙阵修改】 2021-01-07 21:45:22 +08:00
jiaoyangna a5a93d43a7 【ID1007787】
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
2021-01-07 19:24:04 +08:00
jiaoyangna 6ae1a0b75e 【ID1007696】
【优化】逍遥游移动时头顶出现金币的奖励特效
2021-01-07 17:45:50 +08:00
guowei 6c191263bd Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Expedition.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
2021-01-06 20:05:35 +08:00
guowei a5109cd144 【鸿蒙阵bug修改】 2021-01-06 19:35:41 +08:00
zhangqiang 7bedefc780 【战斗回放】 2021-01-06 16:12:54 +08:00
guowei c428fc1fa9 【鸿蒙阵需求修改】 2021-01-06 11:48:29 +08:00
JieLing 03cdc9cf55 Merge branch 'master_xma_test' into gx/test_new
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
2021-01-05 14:23:00 +08:00
guowei 30b0c26a6e 【鸿蒙阵】 2021-01-04 09:57:42 +08:00
jiaoyangna d249a4c0c1 【优化】挂机宝箱显示当前的挂机时间 2020-12-31 15:55:20 +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
JieLing af7e202ea9 【优化】部分界面动画效果优化 2020-12-30 19:51:14 +08:00
zhangqiang 0a2b4f3c3e 【漏提】 2020-12-30 18:25:48 +08:00
zhangqiang a6d16c13e5 【寻宝】加锁 2020-12-30 18:08:44 +08:00
JieLing 1b6c9e6515 【反沉迷提示】还外包删除防沉迷提示 2020-12-30 17:24:06 +08:00
guowei 544be95060 【预制体修改】 2020-12-30 14:51:16 +08:00
JieLing 15099f1e09 【修复】寻宝界面显示错误 2020-12-30 14:26:37 +08:00
jiaoyangna 0e8811df2b 【优化】背包中使用多个道具,明确标注数量 2020-12-30 11:02:44 +08:00
zhangqiang 739f390115 Merge branch 'master_xma_local' into 0功能/1月6_版本优化
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
2020-12-29 17:00:08 +08:00
zhangqiang 1227e93456 【寻宝】 优化 加锁 1 2020-12-29 16:56:18 +08:00
jiaoyangna 1cf3f17888 【优化】神将解锁锁定状态基本看不出来,让其更加明显 2020-12-29 14:23:53 +08:00