Commit Graph

3702 Commits (9aa87b54e2e0eb61522bb4bd567c9bc0c0b609d1)

Author SHA1 Message Date
jiaoyangna b3af8709ae 巅峰赛帮助文本修改 2021-03-04 14:28:46 +08:00
gaoxin 7d2a90fd90 Merge remote-tracking branch 'origin/gx/local_热更配置' into xma/dev
# Conflicts:
#	AssetBundles/version.txt
2021-03-04 13:47:59 +08:00
zhangqiang 7d8145a3b9 【新live2】导入 缺25 2021-03-04 11:44:19 +08:00
ZhangBiao 2d8acdfcd9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 11:05:28 +08:00
ZhangBiao 052767a836 【本地化】鸿蒙阵修改 2021-03-04 11:05:19 +08:00
jiaoyangna f309c54436 导出代码和预设的翻译表 2021-03-04 11:04:47 +08:00
ZhangBiao 7805c09f4d Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-04 10:16:42 +08:00
ZhangBiao 7d678094a3 【本地化】 2021-03-04 10:16:31 +08:00
jiaoyangna 90a87ee396 本地化 提交 2021-03-04 10:16:07 +08:00
ZhangBiao a7e578eea8 【本地化】 2021-03-03 18:31:18 +08:00
ZhangBiao 4861711fbc 【本地化】 2021-03-03 18:25:34 +08:00
ZhangBiao 37dcb0d6ad Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-03 18:07:38 +08:00
ZhangBiao c7ab8fcb8b 【本地化】 2021-03-03 18:07:29 +08:00
jiaoyangna ef65fb91f4 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-03 17:46:19 +08:00
jiaoyangna cf5300bab2 图片提交 2021-03-03 17:46:08 +08:00
zhangqiang 1e1c325229 【神将】 2021-03-03 17:45:34 +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 1ffe352007 【灵兽】 2021-03-03 16:59:52 +08:00
jiaoyangna 3095b8af18 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab
2021-03-03 16:28:47 +08:00
jiaoyangna d429d11d29 图片提交 2021-03-03 16:26:10 +08:00
zhangqiang 59c2caaede 【送神祠本地化修改】 2021-03-03 15:51:04 +08:00
ZhangBiao 09b534b44f 【本地化】 2021-03-03 15:36:17 +08:00
jiaoyangna ac5968285c Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-03 14:19:38 +08:00
jiaoyangna c6f716f1ba 主城修改 2021-03-03 14:19:34 +08:00
zhangqiang bbb7a48e07 福利 2021-03-03 14:15:18 +08:00
jiaoyangna 4e90f04c9d Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-03 12:01:21 +08:00
jiaoyangna 651f328f95 服务器列表 提交 2021-03-03 12:01:17 +08:00
ZhangBiao caaf50cf91 【本地化】 2021-03-03 11:30:06 +08:00
ZhangBiao ff70c8d635 【本地化】竞技场 积天豪礼 2021-03-03 10:07:13 +08:00
jiaoyangna 0851e8e1b8 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 21:06:46 +08:00
jiaoyangna ea6e1f242c 灵兽界面修改提交 2021-03-02 21:06:42 +08:00
ZhangBiao ecd67f5fa5 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 19:58:14 +08:00
ZhangBiao e9e18121d2 【本地化】逍遥游 2021-03-02 19:58:05 +08:00
jiaoyangna b4da5effa6 白片修改提交 2021-03-02 18:29:15 +08:00
ZhangBiao 439df6f2c9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 18:23:25 +08:00
ZhangBiao 1d2e611522 【本地化】森罗任务已完成白片 2021-03-02 18:23:18 +08:00
jiaoyangna 55e120a77b 竞技守卫 2021-03-02 18:08:27 +08:00
jiaoyangna 22b64d085d Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 18:05:10 +08:00
jiaoyangna f7a06a5783 竞技守卫修改 2021-03-02 18:05:06 +08:00
ZhangBiao eee28b7a6c 【本地化】 2021-03-02 17:45:04 +08:00
jiaoyangna 45c90098b2 预设提交 2021-03-02 17:11:00 +08:00
jiaoyangna d81075da7a 还原lua 2021-03-02 16:53:12 +08:00
jiaoyangna d5076fde3c Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 16:44:43 +08:00
jiaoyangna bdb47125a6 Merge branch 'local_to_dev' into xma/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
#	Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.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/Unit/BattleUnit.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.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/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/ExpeditionManager.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/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.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/GuildMemberInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_RankView.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/MonthCardPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.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/PlayerInfoPopup.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/RoleAwakeSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.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/ItemView.lua
#	Assets/ManagedResources/~Lua/View/JumpView.lua
#	Assets/ManagedResources/~Lua/View/ShopView.lua
#	FontArt/ArtFont_zh/hongmengzhen_zh.png
#	FontArt/ArtFont_zh/jianmushenshu_zh.png
#	FontArt/ArtFont_zh/silingshilian_zh.png
2021-03-02 16:44:38 +08:00
ZhangBiao be6b55ce43 【两个备份预设提交】 2021-03-02 16:11:15 +08:00
jiaoyangna fcc02e4875 lua 提交 2021-03-02 15:59:29 +08:00
jiaoyangna 88e59e0c7c lua 提交 2021-03-02 15:49:02 +08:00
ZhangBiao b37d9625a9 【本地化】副本无法进入修复 2021-03-02 15:36:34 +08:00
ZhangBiao f643a1d279 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 15:23:03 +08:00
ZhangBiao f36126d291 【本地化】雷震子技能百篇 2021-03-02 15:22:51 +08:00
gaoxin 0ea1263a66 【配置】配置文件提交 2021-03-02 15:18:49 +08:00
gaoxin d124d59f1b 【配置】完善逻辑并应用 2021-03-02 15:18:06 +08:00
zhangqiang 886536a4ef .cs 还原 2021-03-02 15:14:57 +08:00
jiaoyangna 988c8b514e Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 15:08:29 +08:00
jiaoyangna 0182141c66 灵兽提交 2021-03-02 15:08:08 +08:00
ZhangBiao e6a076afa8 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-02 14:45:52 +08:00
ZhangBiao 3681714bb0 【本地化】牛转钱坤 2021-03-02 14:45:40 +08:00
jiaoyangna 571591eb81 竞技场修改提交 2021-03-02 11:59:01 +08:00
jiaoyangna ae9c306ee6 字体修改优化提交 2021-03-02 11:40:07 +08:00
ZhangBiao 54cfbac8fa 【本地化】巅峰赛白片 2021-03-02 10:57:07 +08:00
JieLing 39a41f45f9 【回滚提交】 2021-03-01 19:48:34 +08:00
ZhangBiao 39b6064c78 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-01 18:29:30 +08:00
ZhangBiao fc08ad0bdf 【本地化】 2021-03-01 18:29:21 +08:00
zhangqiang 4943ca76b5 【报错提交】 2021-03-01 17:47:47 +08:00
ZhangBiao 01e39e0435 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-01 17:27:15 +08:00
ZhangBiao dab25d828f 【本地化】 2021-03-01 17:27:06 +08:00
jiaoyangna 3b917f4c87 文字字体修改完善 2021-03-01 17:22:58 +08:00
jiaoyangna 6506a48bad Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-03-01 17:06:09 +08:00
jiaoyangna f07c4c3952 字体修改提交 2021-03-01 17:06:03 +08:00
zhangqiang 1dd774601a 语法错误 2021-03-01 16:57:23 +08:00
zhangqiang d7f3fc25dd 语法错误 2021-03-01 16:56:52 +08:00
ZhangBiao aef41d8157 【本地化】 2021-03-01 16:18:34 +08:00
ZhangBiao 9b70a72ce7 【本地化】公会boss排名消失 2021-03-01 15:09:10 +08:00
ZhangBiao 84d85ca3a6 【本地化】装备显示错误 2021-03-01 14:49:33 +08:00
ZhangBiao 72f28280ee 【本地化】排行榜显示跳行 2021-03-01 11:39:07 +08:00
ZhangBiao a3debe0e0e 【本地化】英文版本首次试炼必得五星显示不全 2021-03-01 11:34:05 +08:00
ZhangBiao 9a528217d8 【本地化】观音技能白片 2021-03-01 11:15:15 +08:00
gaoxin 6100400afa 【本地化】修复鸿蒙阵白片 2021-02-27 19:30:23 +08:00
gaoxin fffa09cbdb Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-27 19:21:31 +08:00
gaoxin d6613db511 【本地化】修复鸿蒙阵白片 2021-02-27 19:21:25 +08:00
zhangqiang b281d6e5cb Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-27 18:14:53 +08:00
zhangqiang aa0ccbc52c 【越南语】功能解锁 2021-02-27 18:14:39 +08:00
gaoxin 159dd3fa1d 【引导临时处理】关闭高级账号的引导 2021-02-27 18:09:58 +08:00
zhangqiang 843900d659 【越南语】修改 2021-02-27 17:59:07 +08:00
gaoxin 6faa7a29ae Merge branch '0功能/周版本优化0303' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
2021-02-27 17:32:37 +08:00
gaoxin 1ca6517454 Merge commit '0bd2c53e6c38b87ace2ab14a979a56362d35fc7e' into 0功能/周版本优化0303 2021-02-27 17:31:09 +08:00
zhangqiang 73d50e9777 Merge branch '0功能/周版本优化0303' into master_xma_local 2021-02-27 16:55:47 +08:00
zhangqiang 656ebc2d44 【十绝阵】排名修改提交 2021-02-27 16:54:52 +08:00
zhangqiang 2ef4340998 代码错误 2021-02-27 16:52:26 +08:00
zhangqiang ed26774755 【ScrollCycleView】修改6 2021-02-27 16:52:18 +08:00
wangzhenxing 55972b70d7 【战斗】==========除死亡技能外,混乱后的所有技能都变为混乱普攻 2021-02-27 16:52:12 +08:00
wangzhenxing 9362f341a6 [战斗]==============被动200修改,混乱状态下的所有攻击方式都变为混乱普攻 2021-02-27 16:52:06 +08:00
zhangqiang e3bae7a821 提交 2021-02-27 16:52:00 +08:00
zhangqiang 1604821615 【ScrollCycleView】修改5 2021-02-27 16:51:55 +08:00
zhangqiang 8e9c439623 【越南语】修改 2021-02-27 16:36:05 +08:00
zhangqiang 9739ff3090 【越南语】修改 2021-02-27 16:21:23 +08:00
gaoxin bca617284b 【本地化】重置选择神将界面文字超框显示修改 2021-02-27 15:52:11 +08:00
zhangqiang 7a7196f93a 【越南语】修改 2021-02-27 15:42:50 +08:00
gaoxin ae39622310 【本地化】充值界面文字显示错乱修改 2021-02-27 15:22:24 +08:00
gaoxin ff9199d7c9 【本地化】修复充值界面礼包按钮资源错误 2021-02-27 14:55:53 +08:00
gaoxin b3ba0826d9 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-27 14:51:19 +08:00
gaoxin d575bd1313 【本地化】升级,最大星级白片修改 2021-02-27 14:51:14 +08:00
zhangqiang efd3ab9216 【越南包】问题修改 2021-02-27 14:47:57 +08:00
gaoxin 570352ea2c 【本地化】鸿蒙阵按钮资源修改,三界降魔按钮文字资源 2021-02-27 14:34:36 +08:00
gaoxin b72a502a9f 【本地化】不在播放闪屏 2021-02-26 17:58:10 +08:00
liujiaqi 59cfcff035 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-26 17:26:39 +08:00
liujiaqi 8a00efca60 共鸣 英雄界面 提交 2021-02-26 17:26:17 +08:00
wangzhenxing 0bd2c53e6c 【战斗】==========除死亡技能外,混乱后的所有技能都变为混乱普攻 2021-02-26 18:19:54 +09:00
JieLing 619b3d9983 【本地化】挂机界面优化 2021-02-26 17:16:37 +08:00
wangzhenxing 7ae746b318 [战斗]==============被动200修改,混乱状态下的所有攻击方式都变为混乱普攻 2021-02-26 17:00:05 +09:00
gaoxin 2eb23e406b 【本地化】修复月卡界面英文显示错误 2021-02-26 15:52:35 +08:00
gaoxin 16486a13b5 【本地化】添加按比例缩小文字的方法 2021-02-26 15:37:50 +08:00
gaoxin 639602c6ac 【导表工具】关闭老工具显示 2021-02-26 14:39:34 +08:00
gaoxin 5fee9ee759 【bug】修复领取奖励报错的问题 2021-02-26 14:39:25 +08:00
jiaoyangna 84ae606ee9 限时召唤白片提交 2021-02-26 13:47:04 +08:00
jiaoyangna 8753e784ec 图片提交 2021-02-26 13:44:50 +08:00
liujiaqi 866fd6c3fc 【资源】越南语临时资源替换 2021-02-26 11:23:02 +08:00
jiaoyangna 9f05f94439 本地化 2021-02-26 10:53:37 +08:00
zhangqiang 545dee3df1 【ScrollCycleView】修改4 2021-02-26 10:37:39 +08:00
jiaoyangna 3f38b704be 已修改 2021-02-26 10:32:02 +08:00
gaoxin edec649f64 【bug】修复合成时log信息导致的报错 2021-02-26 10:13:27 +08:00
gaoxin 584431db2e 【bug】修复新将战斗跳过回到新将界面还会播放战斗音效的问题 2021-02-26 10:08:36 +08:00
jiaoyangna c235f6df6a Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-26 09:59:06 +08:00
jiaoyangna b93f69cfa6 文字导出 2021-02-26 09:59:01 +08:00
gaoxin 395d776dec Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 21:51:14 +08:00
gaoxin daba5a7d0e 【本地化】工具再调整 2021-02-25 21:50:56 +08:00
jiaoyangna f08477cbd6 积分礼包领不了 2021-02-25 21:45:52 +08:00
jiaoyangna 6bf391f175 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 21:43:03 +08:00
gaoxin db1cd07e4f Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 21:42:38 +08:00
jiaoyangna bacf88be86 日志,本地化修改 2021-02-25 21:42:38 +08:00
gaoxin 7f8fb4aef3 【本地化】语言工具调整 2021-02-25 21:42:33 +08:00
gaoxin 2f22ac850a 【本地化】资源导入调整 2021-02-25 21:40:05 +08:00
wangzhenxing 0e23ca3cf8 [战斗]======= 2021-0303发布计划 战斗修改 2021-02-25 19:48:24 +09:00
jiaoyangna e46d735134 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 18:36:55 +08:00
jiaoyangna 69a2253d12 装备提交 2021-02-25 18:36:50 +08:00
gaoxin 20622e5e62 【本地化】文字自适应大小并自动换行 2021-02-25 17:46:32 +08:00
gaoxin c6430f59a5 【本地化】乾坤宝盒界面相关修改 2021-02-25 17:31:26 +08:00
gaoxin 5a4742610a Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 16:12:51 +08:00
gaoxin 22536f7076 【本地化】限时召唤,按钮拉长,气泡随文字多少变化 2021-02-25 16:12:46 +08:00
jiaoyangna f25d5b7242 合成神将修改 2021-02-25 15:56:52 +08:00
jiaoyangna d2dbaec760 英雄合成提交 2021-02-25 15:46:27 +08:00
jiaoyangna 4c88ab3c39 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 15:41:44 +08:00
jiaoyangna 3a31425e5a 装备合成界面修改 2021-02-25 15:41:34 +08:00
gaoxin 2f59385c18 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 15:38:34 +08:00
gaoxin 7ea798b693 【本地化】部分活动介绍界面内容改为可滑动 2021-02-25 15:38:27 +08:00
jiaoyangna 46bc97fdeb 魂印界面修改提交 2021-02-25 15:36:46 +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 7a0730fbe7 容错修改 2021-02-25 15:04:54 +08:00
gaoxin 9c15d51669 Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-02-25 14:33:27 +08:00
gaoxin 0babcc640b 【报警】添加用于确认登录成功的接口,后端用于登录监测告警 2021-02-25 14:33:23 +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
gaoxin 16ea6c16de 【配置】功能配置添加 2021-02-25 14:19:00 +08:00
jiaoyangna fe881897dc Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容 2021-02-25 13:47:09 +08:00
jiaoyangna e709c80428 竞技场修改 2021-02-25 13:47:04 +08:00
ZhangBiao b2dbdfe599 【本地化】page12 14 jumpview 2021-02-25 13:31:27 +08:00
zhangqiang 5699b89258 【ScrollCycleView】修改3 2021-02-25 12:04:31 +08:00
zhangqiang 67d0dfa44f 【抽卡奖池】显示问题 2021-02-25 12:00: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 d14e8a8b31 Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev 2021-02-25 10:41:13 +08:00
jiaoyangna e953005b6e 活动排行 灵兽抽卡 修改 2021-02-25 10:41:07 +08:00
jiaoyangna f3cc8413f2 主题活动提交 2021-02-25 10:20:14 +08:00
ZhangBiao b15603c722 【本地化】 2021-02-25 10:17:24 +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
zhangqiang 39d43b11bc 【神将定位】觉醒后神将定位可能发生变化,但定位弹窗内容未改变2 2021-02-24 19:48:04 +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 da35c73296 灵兽分解修改 2021-02-24 17:48:35 +08:00
jiaoyangna 661b191fa9 驭兽斋抽卡无响应 2021-02-24 17:45:48 +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
gaoxin bb68af637a 【战斗】修复孙悟空和观音菩萨同时死亡导致报错的问题 2021-02-24 17:02:31 +08:00
zhangqiang d454c3bf08 【神将定位】觉醒后神将定位可能发生变化,但定位弹窗内容未改变 2021-02-24 16:47:20 +08:00
jiaoyangna fd2626bfb1 青龙秘宝修改 2021-02-24 15:41:23 +08:00
jiaoyangna ab27a768cf 青龙秘宝修改 2021-02-24 15:37:17 +08:00