zhangqiang
|
c4c5bb1074
|
【神将没有升级材料依旧会出现小红点】
|
2021-03-23 15:53:59 +08:00 |
ZhangBiao
|
2f658f1157
|
【装备种类显示】
|
2021-03-19 21:30:22 +08:00 |
gaoxin
|
4c30b42f61
|
【bug】修复替换装备时按钮文字错误
|
2021-03-18 10:16:34 +08:00 |
gaoxin
|
64ee4697f5
|
【bug】点击替换装备,装备图标跟穿戴着的图标一样
|
2021-03-18 10:07:03 +08:00 |
gaoxin
|
aa30b1ed6e
|
【bug】修复升级神将立即关闭界面,再次打开界面时显示错误
|
2021-03-17 15:29:23 +08:00 |
jiaoyangna
|
838de7cd1c
|
文字提交
|
2021-03-12 14:31:52 +08:00 |
jiaoyangna
|
1cd3d4cdaa
|
文字提交
|
2021-03-12 14:20:14 +08:00 |
gaoxin
|
13fbabf125
|
【bug】修复老包中文字重叠
|
2021-03-09 15:39:42 +08:00 |
gaoxin
|
766ba304ed
|
【本地化】法宝回收提示文本翻译,神将装备界面对比套装属性翻译,轩辕宝镜充值界面文本显示调整
|
2021-03-08 16:51:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
f0e2df5aed
|
【本地化】
|
2021-01-29 14:36:50 +08:00 |
gaoxin
|
bbca0ca426
|
【本地化】装备切换界面套装属性翻译,成就提示文字超框显示修改
|
2021-03-07 19:06:13 +08:00 |
jiaoyangna
|
17b6ae35b1
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-07 17:52:27 +08:00 |
jiaoyangna
|
c86865b3dd
|
装备提交
|
2021-03-07 17:52:23 +08:00 |
jiaoyangna
|
6d985b13e2
|
本地化
|
2021-03-07 17:00:50 +08:00 |
zhangqiang
|
5c641ef598
|
【灵兽主界面等级 + 升级成功】
|
2021-03-05 14:13:13 +08:00 |
jiaoyangna
|
7c5fd4408e
|
本地化提交
|
2021-03-05 14:00:45 +08:00 |
gaoxin
|
d31b9298df
|
【本地化】lua文本重新导出
|
2021-03-04 16:44:37 +08:00 |
zhangqiang
|
1e1c325229
|
【神将】
|
2021-03-03 17:45:34 +08:00 |
jiaoyangna
|
d81075da7a
|
还原lua
|
2021-03-02 16:53:12 +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 |
jiaoyangna
|
fcc02e4875
|
lua 提交
|
2021-03-02 15:59:29 +08:00 |
jiaoyangna
|
88e59e0c7c
|
lua 提交
|
2021-03-02 15:49:02 +08:00 |
ZhangBiao
|
84d85ca3a6
|
【本地化】装备显示错误
|
2021-03-01 14:49:33 +08:00 |
zhangqiang
|
1604821615
|
【ScrollCycleView】修改5
|
2021-02-27 16:51:55 +08:00 |
liujiaqi
|
8a00efca60
|
共鸣 英雄界面 提交
|
2021-02-26 17:26:17 +08:00 |
jiaoyangna
|
b93f69cfa6
|
文字导出
|
2021-02-26 09:59:01 +08:00 |
jiaoyangna
|
69a2253d12
|
装备提交
|
2021-02-25 18:36:50 +08:00 |
ZhangBiao
|
61b22edef5
|
【本地化】提交
|
2021-02-24 20:56:01 +08:00 |
zhangqiang
|
39d43b11bc
|
【神将定位】觉醒后神将定位可能发生变化,但定位弹窗内容未改变2
|
2021-02-24 19:48:04 +08:00 |
zhangqiang
|
d454c3bf08
|
【神将定位】觉醒后神将定位可能发生变化,但定位弹窗内容未改变
|
2021-02-24 16:47:20 +08:00 |
zhangqiang
|
ac3fe3f251
|
【升星界面调整】9升10星,十星位置需调整
|
2021-02-24 10:53:21 +08:00 |
ZhangBiao
|
64e2464cf9
|
【本地化】预设位置调整
|
2021-02-23 17:04:52 +08:00 |
ZhangBiao
|
3674cdd886
|
【本地化】神将装备界面调整
|
2021-02-23 14:57:04 +08:00 |
ZhangBiao
|
bec4de4ae2
|
【本地化】英雄界面下方页签调整
|
2021-02-23 14:20:39 +08:00 |
jiaoyangna
|
5f1d583737
|
白片修改提交
|
2021-02-23 10:57:38 +08:00 |
jiaoyangna
|
a5453201cc
|
解决冲突
|
2021-02-23 10:53:33 +08:00 |
jiaoyangna
|
6eb45cd1e6
|
预设白片提交
|
2021-02-23 10:51:52 +08:00 |
jiaoyangna
|
e4f4649cf9
|
文本提交
|
2021-02-20 18:01:57 +08:00 |
zhangqiang
|
bf24b8cc51
|
【鸿蒙阵】330 bug
|
2021-02-20 17:55:57 +08:00 |
jiaoyangna
|
a05694855c
|
Merge branch 'local_to_xmadev' into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
# Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
# Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
# Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
# Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
# Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
# Assets/ManagedResources/~Lua/View/JumpView.lua
# Assets/ManagedResources/~Lua/View/ShopView.lua
|
2021-02-20 17:55:52 +08:00 |
jiaoyangna
|
629971d137
|
文本还原提交
|
2021-02-20 16:55:28 +08:00 |
jiaoyangna
|
602dbc924c
|
文本还原
|
2021-02-20 16:43:44 +08:00 |
guowei
|
375f27f50e
|
【红点检测】
|
2021-02-20 14:52:04 +08:00 |
zhangqiang
|
ca7a4aa10b
|
【装备数量显示】 装备数量 改为 装备种类
|
2021-02-19 15:13:38 +08:00 |
zhangqiang
|
1c95b576f0
|
Merge branch '0功能/鸿蒙门阵' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
|
2021-02-19 10:54:36 +08:00 |
gaoxin
|
78e7305c15
|
【本地化】导出中文
|
2021-02-05 15:58:37 +08:00 |
gaoxin
|
e9ea58aaf3
|
【本地化】界面冲突修正
|
2021-02-05 15:45:23 +08:00 |
gaoxin
|
90bf24b3b0
|
Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ActivityGift/CourtesyDressPanel.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
# Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Operating/OperatingPanel.prefab
# Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
# Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
# Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
# Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
# Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
# Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
# Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua
# Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
# Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua
# Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
# Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
# Assets/ManagedResources/~Lua/Modules/TreasureStore/TreasureStorePopup.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
# Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
# Assets/ManagedResources/~Lua/View/JumpView.lua
# Assets/ManagedResources/~Lua/View/ShopView.lua
|
2021-02-05 14:30:05 +08:00 |
gaoxin
|
927025f6de
|
【本地化】中文字还原,合并用
|
2021-02-05 12:44:50 +08:00 |
gaoxin
|
5ce8497899
|
【本地化】中文字还原,合并用
|
2021-02-05 12:00:39 +08:00 |
gaoxin
|
adf591cbec
|
【本地化】lua代码还原
|
2021-01-27 18:16:54 +08:00 |
guowei
|
f0eb57d0a4
|
【鸿蒙阵问题修改】
|
2021-01-26 20:21:01 +08:00 |
gaoxin
|
c567dcd426
|
【本地化】代码本地化提交
|
2021-01-26 17:08:39 +08:00 |
guowei
|
08236ad6a9
|
【鸿蒙阵问题修改】
|
2021-01-26 14:47:01 +08:00 |
gaoxin
|
81b3ca1ddc
|
【本地化】 中文字还原,合并代码用
|
2021-01-26 11:13:09 +08:00 |
gaoxin
|
802881378c
|
Merge branch 'master_xma_local' into gx/xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
|
2021-01-26 11:08:54 +08:00 |
gaoxin
|
3b83a72215
|
【本地化】文字还原
|
2021-01-26 11:05:27 +08:00 |
guowei
|
c5a35fa707
|
【鸿蒙阵问题修改】
|
2021-01-26 10:33:08 +08:00 |
guowei
|
594bab5024
|
【鸿蒙阵修改】
|
2021-01-25 16:41:23 +08:00 |
guowei
|
f86c0122bc
|
【魂印添加新手引导】
|
2021-01-20 17:26:31 +08:00 |
guowei
|
bf0ac8322d
|
【鸿蒙阵bug修改】
|
2021-01-20 17:23:55 +08:00 |
guowei
|
6617d818c0
|
【鸿蒙阵bug修改】
|
2021-01-20 13:52:53 +08:00 |
guowei
|
d85cb48f6d
|
【鸿蒙阵缺陷修改】
|
2021-01-20 10:37:02 +08:00 |
guowei
|
5a11596515
|
【鸿蒙阵修改】
|
2021-01-18 17:43:11 +08:00 |
DESKTOP-98AVA47\Administrator
|
8f437f407d
|
【本周优化修改】
|
2021-01-15 22:11:38 +08:00 |
DESKTOP-98AVA47\Administrator
|
040971534e
|
【巅峰赛限时头像修改】
|
2021-01-15 21:06:48 +08:00 |
guowei
|
8ca0dac9b3
|
【鸿蒙阵 bug修改】
|
2021-01-15 11:49:41 +08:00 |
guowei
|
fe6b09c8a6
|
【鸿蒙阵bug修改】
|
2021-01-15 10:26:56 +08:00 |
guowei
|
b42a1c8e61
|
【鸿蒙阵修改】
|
2021-01-14 21:11:53 +08:00 |
guowei
|
3f8312953e
|
Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
|
2021-01-14 10:20:12 +08:00 |
gaoxin
|
f501e92272
|
【本地化】代码还原,合并用
|
2021-01-12 11:00:44 +08:00 |
gaoxin
|
ae7da93056
|
【本地化】还原文字
|
2021-01-12 10:56:26 +08:00 |
guowei
|
7aac4cbd32
|
【1/11鸿蒙阵bug修改】
|
2021-01-11 21:04:12 +08:00 |
guowei
|
e1886a2d9a
|
【鸿蒙阵bug修改】
|
2021-01-11 14:36:01 +08:00 |
guowei
|
c252f1bae6
|
【鸿蒙阵修改】
|
2021-01-09 14:30:35 +08:00 |
gaoxin
|
27b3c1ea32
|
【本地化】还原文本到代码中合并用
|
2021-01-09 14:20:06 +08:00 |
guowei
|
3ded7b31fc
|
【鸿蒙阵修改】
|
2021-01-08 17:29:54 +08:00 |
guowei
|
f28818d4aa
|
【鸿蒙阵修改】
|
2021-01-07 21:45:22 +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 |
DESKTOP-98AVA47\Administrator
|
e5b2be7e81
|
【鸿蒙阵修改】
|
2021-01-12 00:55:02 +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 |
gaoxin
|
9f691e4e05
|
【优化】scrollview分帧加载-游戏内适应性修改
|
2020-12-29 20:37:57 +08:00 |
guowei
|
ca9a6a933b
|
【鸿蒙阵修改】
|
2020-12-29 20:36:37 +08:00 |
jiaoyangna
|
1cf3f17888
|
【优化】神将解锁锁定状态基本看不出来,让其更加明显
|
2020-12-29 14:23:53 +08:00 |
jiaoyangna
|
d85bd9c3aa
|
【优化】背包分类优化
|
2020-12-28 16:25:38 +08:00 |
guowei
|
d989aa5b85
|
【鸿蒙阵bug修改】
|
2020-12-28 13:37:30 +08:00 |
gaoxin
|
bf6fd2d13d
|
Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-12-26 20:22:23 +08:00 |
wangzhenxing
|
96f31b63ad
|
[优化]魂宝灵宝加号点击区域扩大
|
2020-12-26 19:45:44 +09:00 |
wangzhenxing
|
e4596beb99
|
【宝物】==========宝物添加加号提示
|
2020-12-26 19:44:48 +09:00 |
guowei
|
d36276eb0c
|
【鸿蒙阵修改】
|
2020-12-26 15:07:51 +08:00 |
guowei
|
5eb853efbd
|
【鸿蒙阵bug修改】
|
2020-12-25 15:33:12 +08:00 |
guowei
|
2ac574ff06
|
【鸿蒙阵bug】更新
|
2020-12-23 17:41:31 +08:00 |
zhangqiang
|
1ba79f4627
|
【装备页面】神将一键装备功能提示 已为最强装备
|
2020-12-23 16:46:41 +08:00 |
ZhangBiao
|
38a1eeee9a
|
Merge branch '0活动开发聚集地/升星有礼' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-23 11:29:12 +08:00 |
guowei
|
0dd211f896
|
【鸿蒙阵】更新
|
2020-12-22 15:41:45 +08:00 |
zhangqiang
|
4db72018cb
|
【鸿蒙阵】 提示变更
|
2020-12-22 09:52:40 +08:00 |
gaoxin
|
a0f059ca9b
|
【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误
|
2020-12-21 18:45:58 +08:00 |
ZhangBiao
|
12760d7cb1
|
【升星有礼】完成
|
2020-12-21 15:41:31 +08:00 |
zhangqiang
|
4b49661f24
|
【鸿蒙阵】修改
|
2020-12-18 18:25:38 +08:00 |
zhangqiang
|
00980feb57
|
Merge branch '0功能/鸿蒙门阵' of http://60.1.1.230/gaoxin/JL_Client into 0功能/鸿蒙门阵
|
2020-12-18 16:38:03 +08:00 |
zhangqiang
|
e09ed9fdfc
|
【鸿蒙阵】 限制
|
2020-12-18 16:37:56 +08:00 |
guowei
|
f744e609a1
|
【鸿蒙阵剩余图片】
|
2020-12-18 16:31:28 +08:00 |
guowei
|
52d493ebc7
|
【鸿蒙阵】二次提交
|
2020-12-17 10:41:00 +08:00 |
zhangqiang
|
328af3f66b
|
【装备套装】
|
2020-12-12 17:07:22 +08:00 |
zhangqiang
|
03e0e73665
|
【装备套装】 套装属性向下兼容
|
2020-12-11 17:31:11 +08:00 |
zhangqiang
|
cae41baf71
|
【图鉴】 升星点亮图鉴 调整献祭坛预设
|
2020-11-17 10:57:16 +08:00 |
zhangqiang
|
2000240f64
|
【觉醒】 提示文字
|
2020-11-16 14:57:46 +08:00 |
zhangqiang
|
2f5b2c2d4f
|
【觉醒】 觉醒成功界面显示bug
|
2020-11-13 10:11:41 +08:00 |
zhangqiang
|
cbf9f5cade
|
【觉醒】问题修改
|
2020-11-12 13:55:46 +08:00 |
zhangqiang
|
0ca5e4ea13
|
【觉醒】bug
|
2020-11-11 20:21:37 +08:00 |
zhangqiang
|
adf9c87ac2
|
【灵兽提交】bug修改
|
2020-11-11 20:21:13 +08:00 |
zhangqiang
|
629eb98f1b
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
|
2020-11-11 11:37:26 +08:00 |
zhangqiang
|
90e9e84c64
|
【觉醒】十一星的星级展示修改
|
2020-11-11 11:12:14 +08:00 |
zhangqiang
|
053de93608
|
【神将觉醒】 提交
|
2020-11-10 18:35:37 +08:00 |
zhangqiang
|
48e6d33b7b
|
【神将觉醒】 效果图 资源 提交
|
2020-11-10 17:29:38 +08:00 |
jiaoyangna
|
22d3761937
|
Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
|
2020-11-10 10:24:07 +08:00 |
jiaoyangna
|
3f7ae45011
|
皮肤修改
|
2020-11-10 10:23:55 +08:00 |
zhangqiang
|
6278bb0cc8
|
【神将升级】 升星未卡住 and 神将合成报错
|
2020-11-10 10:16:23 +08:00 |
zhangqiang
|
92d85c4200
|
【神将升级】 升星未卡住 and 神将合成报错
|
2020-11-10 10:16:01 +08:00 |
zhangqiang
|
6a1693939c
|
【觉醒】 觉醒添加图鉴
|
2020-11-09 20:05:51 +08:00 |
zhangqiang
|
85b21b27f0
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
|
2020-11-09 18:04:54 +08:00 |
zhangqiang
|
c4a466637f
|
【神将升级】 太快优化
|
2020-11-09 16:29:06 +08:00 |
zhangqiang
|
f94c84f1cd
|
【觉醒】 增加觉醒页签
|
2020-11-09 15:04:48 +08:00 |
zhangqiang
|
de677bee2f
|
【觉醒】增加脚本
|
2020-11-09 11:13:53 +08:00 |
zhangqiang
|
5c73587f89
|
Merge branch 'master_xma_local' into 0功能/神将觉醒
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2020-11-09 10:16:16 +08:00 |
jiaoyangna
|
f26214ac58
|
清楚红点提交
|
2020-11-07 17:23:10 +08:00 |
jiaoyangna
|
bc097708e9
|
不满足进阶条件,显示红点
|
2020-11-07 16:41:25 +08:00 |
jiaoyangna
|
e2b29242c7
|
有孙悟空皮肤,东华帝君皮肤点不到获取途径
|
2020-11-07 15:52:20 +08:00 |
jiaoyangna
|
f2f288c682
|
进阶页签属性图标显示错误
|
2020-11-07 15:44:53 +08:00 |
jiaoyangna
|
04fac7f216
|
魂印,法宝,进阶界面修改皮肤立绘,添加皮肤活动界面的假战斗
|
2020-11-07 15:39:01 +08:00 |
jiaoyangna
|
ef4c4fccba
|
power change update
|
2020-11-14 14:31:38 +08:00 |
jiaoyangna
|
c639ea1c6b
|
delete log
|
2020-11-14 14:16:41 +08:00 |
jiaoyangna
|
069d42baca
|
皮肤到期刷新
|
2020-11-14 14:16:10 +08:00 |
zhangqiang
|
68979d577e
|
【神将觉醒】 觉醒成功界面
|
2020-11-07 15:15:49 +08:00 |
jiaoyangna
|
3a481d6d5f
|
[皮肤]修改提交
|
2020-11-06 21:05:39 +08:00 |
jiaoyangna
|
0a772f466b
|
皮肤提交
|
2020-11-06 20:36:38 +08:00 |
jiaoyangna
|
cd99dd509b
|
立绘加载错误修改
|
2020-11-06 16:37:52 +08:00 |
zhangqiang
|
1a4349d93b
|
【觉醒】 界面提交
|
2020-11-06 16:23:02 +08:00 |
jiaoyangna
|
5251bc4059
|
[神将界面修改]
|
2020-11-06 16:11:37 +08:00 |
jiaoyangna
|
ccf02fb171
|
【皮肤】添加倒计时
|
2020-11-05 18:26:38 +08:00 |
jiaoyangna
|
5026bdd0c3
|
【皮肤】提交
|
2020-11-05 16:02:49 +08:00 |
jiaoyangna
|
360727419e
|
【皮肤】修改皮肤显示
|
2020-11-04 16:51:45 +08:00 |
jiaoyangna
|
4cb31d8f38
|
[皮肤]提交
|
2020-11-04 10:59:04 +08:00 |
jiaoyangna
|
1fcdf5b2a6
|
【皮肤】添加皮肤属性加成
|
2020-11-03 19:37:05 +08:00 |
jiaoyangna
|
e92e63444b
|
皮肤提交
|
2020-11-03 17:27:32 +08:00 |
jiaoyangna
|
d040e4dded
|
神将界面结构修改
|
2020-11-03 15:17:48 +08:00 |
zhangqiang
|
3de1b43922
|
【神将升级 优化】 觉醒提示文字修改
|
2020-12-05 13:29:32 +08:00 |
zhangqiang
|
721418b30a
|
线上问题 宝器分解bug
|
2020-10-12 15:55:04 +08:00 |