PC-202302260912\Administrator
|
a147ad3861
|
层级调整
|
2024-12-23 16:24:26 +08:00 |
PC-202302260912\Administrator
|
553012e81f
|
界面修改1
|
2024-11-16 15:52:47 +08:00 |
PC-202302260912\Administrator
|
f7aa0a5134
|
优化页面
|
2024-10-09 16:02:10 +08:00 |
PC-202302260912\Administrator
|
df3d081d4c
|
修改分解页面
|
2024-10-09 13:26:18 +08:00 |
PC-202302260912\Administrator
|
c479090326
|
遣散成员
|
2024-07-11 14:33:20 +08:00 |
wangzhenxing
|
a0b89f30d2
|
适配提交
|
2024-02-27 16:24:08 +08:00 |
wangzhenxing
|
76105dd37c
|
圣器信息界面修改
|
2024-01-24 16:32:52 +08:00 |
xiejun
|
2ce7e16212
|
修改底部按钮
|
2024-01-19 18:19:07 +08:00 |
wangzhenxing
|
6eaa7d265f
|
分解界面修改
|
2024-01-16 18:00:29 +08:00 |
wangzhenxing
|
1fbee5e40d
|
分解界面修改
|
2024-01-16 17:41:36 +08:00 |
wangzhenxing
|
16ed97d86b
|
装备售卖界面修改提交
|
2024-01-15 15:10:19 +08:00 |
wangzhenxing
|
04f8732274
|
分解英雄修改提交
|
2023-12-05 16:18:04 +08:00 |
wangzhenxing
|
69c876c938
|
灵兽分解修改提交
|
2023-12-04 19:31:53 +08:00 |
wangzhenxing
|
3df62f9ebf
|
解散界面修改
|
2023-11-09 11:34:01 +08:00 |
xiejun
|
100980e98b
|
删除老预制体
|
2023-10-23 17:51:23 +08:00 |
xiejun
|
eb926fc087
|
灵兽
|
2023-09-28 17:05:40 +08:00 |
wangzhenxing
|
e3a8cd725f
|
合并冲突提交
|
2023-09-15 14:24:03 +08:00 |
wangzhenxing
|
826f58ce6e
|
神兵提交
|
2023-03-28 13:57:59 +08:00 |
yuanshuai
|
e91edae1cf
|
建木神树bug修改
|
2022-09-06 15:47:16 +08:00 |
jiaoyangna
|
1c2758f26c
|
送神祠星级修改
|
2021-11-05 15:48:22 +08:00 |
jiaoyangna
|
0a955034c7
|
【ID1018447】
【送神祠】阵营筛选的选中框资源错误
|
2021-09-11 17:19:37 +08:00 |
jiaoyangna
|
c18094ff97
|
精炼等级位置修改
|
2021-09-08 11:37:37 +08:00 |
jiaoyangna
|
01632378f6
|
魂印分解界面修改
|
2021-07-29 15:21:44 +08:00 |
jiaoyangna
|
856f03b494
|
【ID1017815】
【魂印分解】一键选择,优先选择了品质高的魂印
|
2021-07-29 15:01:58 +08:00 |
zhangqiang
|
60353d6dbd
|
【归元优化】bug
|
2021-03-31 17:40:51 +08:00 |
zhangqiang
|
2bfccba248
|
【适配】魂印分解...
|
2021-03-31 14:03:18 +08:00 |
zhangqiang
|
9faf244e40
|
【归元修改】 神将 法宝 归元修改
|
2021-03-30 16:36:00 +08:00 |
jiaoyangna
|
ba7a5fbb18
|
本地化提交
|
2021-03-04 19:04:33 +08:00 |
jiaoyangna
|
90a87ee396
|
本地化 提交
|
2021-03-04 10:16:07 +08:00 |
zhangqiang
|
59c2caaede
|
【送神祠本地化修改】
|
2021-03-03 15:51:04 +08:00 |
ZhangBiao
|
dab25d828f
|
【本地化】
|
2021-03-01 17:27:06 +08:00 |
jiaoyangna
|
ee8a721624
|
灵兽抽卡修改
|
2021-02-24 18:00:19 +08:00 |
ZhangBiao
|
74185b0d1b
|
【本地化】
|
2021-02-24 11:23:53 +08:00 |
ZhangBiao
|
5d1b8bf9b9
|
【本地化】界面挑战
|
2021-02-23 17:41:59 +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 |
gaoxin
|
12356f5ed7
|
【本地化】预设提交
|
2021-01-26 17:48:24 +08:00 |
jiaoyangna
|
e95ae4724b
|
【优化】放生灵兽添加开启等级。
|
2020-12-24 16:19:32 +08:00 |
zhangqiang
|
e09ed9fdfc
|
【鸿蒙阵】 限制
|
2020-12-18 16:37:56 +08:00 |
guowei
|
861b02f0c8
|
【鸿蒙阵初版】
|
2020-12-15 11:03:34 +08:00 |
zhangqiang
|
cae41baf71
|
【图鉴】 升星点亮图鉴 调整献祭坛预设
|
2020-11-17 10:57:16 +08:00 |
zhangqiang
|
b1128dd88e
|
【献祭坛】适配调试
|
2020-11-12 17:05:34 +08:00 |
zhangqiang
|
8a73056eac
|
【献祭坛】预设微调
|
2020-11-12 17:04:06 +08:00 |
zhangqiang
|
f8b4befd3c
|
【灵兽系统】 按钮位置调整
|
2020-11-03 14:17:33 +08:00 |
wangzhenxing
|
36b9ffce91
|
【bug】分解界面等级星级显示修改
|
2020-11-02 20:13:57 +09:00 |
wangzhenxing
|
868eb64ae1
|
[bug] 分解神将等级显示999
|
2020-11-02 20:09:24 +09:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
zhangqiang
|
c35058767b
|
shi pei
|
2020-09-05 15:20:30 +08:00 |
ZhangBiao
|
5330808e19
|
送神祠动效增加
|
2020-09-04 17:33:42 +08:00 |
gaoxin
|
b3dab63ca4
|
屏幕适配修改
|
2020-09-02 20:27:21 +08:00 |
ZhangBiao
|
3c0c8e3f15
|
【页签优化】部分页签设定按照玩家等级开启
|
2020-09-02 18:33:17 +08:00 |