zhangqiang
|
132e4c1260
|
【bug】奖励排行拉不到底部
|
2021-04-07 10:30:47 +08:00 |
gaoxin
|
9033d47109
|
【本地化】文本导出
|
2021-04-06 22:33:57 +08:00 |
gaoxin
|
b163fc3035
|
【表删除】报错处理
|
2021-04-06 15:16:37 +08:00 |
gaoxin
|
b53717c9ee
|
【本地化】还原文本
|
2021-04-01 18:41:50 +08:00 |
gaoxin
|
cbb28ebeae
|
【本地化】文本导出
|
2021-04-01 18:36:34 +08:00 |
zhangqiang
|
a20dc99f99
|
【大闹天宫】挑战失败后显示两个可挑战图标,点击另一个未挑战过的怪没反应,退出重进显示正常
|
2021-04-01 10:39:03 +08:00 |
zhangqiang
|
987179041c
|
【创建名字】boy
|
2021-03-31 22:25:54 +08:00 |
jiaoyangna
|
0494e55215
|
Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
|
2021-03-30 20:41:32 +08:00 |
jiaoyangna
|
c2fac79eca
|
活动 提交
|
2021-03-30 18:26:10 +08:00 |
zhangqiang
|
82b1de6537
|
【称号坐骑时装】飘战力 快捷跳转
|
2021-03-30 17:17:11 +08:00 |
zhangqiang
|
9faf244e40
|
【归元修改】 神将 法宝 归元修改
|
2021-03-30 16:36:00 +08:00 |
zhangqiang
|
25e351dba3
|
【称号坐骑时装】修改
|
2021-03-30 10:28:03 +08:00 |
zhangqiang
|
76c9760993
|
Merge branch 'china/dev' into 0功能/称号坐骑皮肤
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab
|
2021-03-29 17:56:19 +08:00 |
zhangqiang
|
51bb90edce
|
【称号坐骑时装】 协议 无尽副本修改
|
2021-03-29 12:07:28 +08:00 |
jiaoyangna
|
e7dff66a4f
|
品阶错误修改
|
2021-03-29 10:15:25 +08:00 |
JieLing
|
5883b66fca
|
【十绝阵】开服3天内通过公会御令获取途径可以进入
|
2021-03-27 17:44:05 +08:00 |
gaoxin
|
b18ad8487a
|
【战斗】casting层级调整,失败界面打开1秒后才能关闭
|
2021-03-26 12:15:48 +08:00 |
zhangqiang
|
cc9b681875
|
【碎片】用碎片合成神将点击查看详情有问题
|
2021-03-18 16:09:44 +08:00 |
jiaoyangna
|
0209a90c27
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-18 11:13:26 +08:00 |
jiaoyangna
|
11a5cf2a99
|
【首充】孙悟空页面详情天赋显示错误
|
2021-03-18 11:13:10 +08:00 |
zhangqiang
|
88b1230c42
|
【本地化魂印】专属魂印适用范围不显示
|
2021-03-18 10:41:54 +08:00 |
zhangqiang
|
6eb9050d4a
|
【轩辕宝镜】不进版本但是可以通过穿戴界面道具跳转
|
2021-03-17 17:17:20 +08:00 |
zhangqiang
|
d5f34e516c
|
【巅峰赛】巅峰赛中的机器人详情页有加好友和加黑名单、切磋等按钮,没有屏蔽掉
|
2021-03-17 16:56:02 +08:00 |
JieLing
|
c945f53946
|
【修改bug】提交 竞技场 + 试炼奖励优化list重叠
|
2021-03-16 16:06:55 +08:00 |
jiaoyangna
|
8656408ac9
|
宝箱状态修改
|
2021-03-12 18:18:25 +08:00 |
jiaoyangna
|
aa94edf1d7
|
Merge branch 'xma/dev' into 0功能/本周版本优化内容
|
2021-03-12 16:41:18 +08:00 |
jiaoyangna
|
fa64d90f08
|
社稷大点领取奖励后宝箱状态修改
(cherry picked from commit 7fe83b0cea )
|
2021-03-12 15:55:57 +08:00 |
ZhangBiao
|
51c0b51a87
|
【本地化】魂灵宝处需要修改
|
2021-03-12 15:07:17 +08:00 |
jiaoyangna
|
838de7cd1c
|
文字提交
|
2021-03-12 14:31:52 +08:00 |
jiaoyangna
|
dd706075d2
|
Merge branch 'xma/dev' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyPanel.lua
# Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua
# Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua
# Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
|
2021-03-12 14:30:10 +08:00 |
jiaoyangna
|
8430af12af
|
文字提交
|
2021-03-12 14:24:41 +08:00 |
jiaoyangna
|
1cd3d4cdaa
|
文字提交
|
2021-03-12 14:20:14 +08:00 |
jiaoyangna
|
04ab1e5451
|
社稷大典奖励领取提交
|
2021-03-12 10:32:32 +08:00 |
ZhangBiao
|
4631f663a8
|
【本地化】魂灵宝处需要修改
|
2021-03-11 10:41:34 +08:00 |
jiaoyangna
|
4121f24a27
|
Merge branch 'master_xma_local' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
|
2021-03-10 13:50:38 +08:00 |
gaoxin
|
e3bc4ecfe0
|
【本地化】修复升级重复显示lv文字
|
2021-03-10 11:04:46 +08:00 |
gaoxin
|
766ba304ed
|
【本地化】法宝回收提示文本翻译,神将装备界面对比套装属性翻译,轩辕宝镜充值界面文本显示调整
|
2021-03-08 16:51:13 +08:00 |
gaoxin
|
c97b14319c
|
【本地化】随即名字本地化处理
|
2021-03-05 14:43:27 +08:00 |
ZhangBiao
|
eaac0b6cd1
|
Revert "【本地化】随机名字本地化"
This reverts commit 8dadc2d54b .
|
2021-03-05 14:36:19 +08:00 |
ZhangBiao
|
8dadc2d54b
|
【本地化】随机名字本地化
|
2021-03-05 14:32:29 +08:00 |
zhangqiang
|
7770865a40
|
【主题活动修改】
|
2021-03-04 22:15:24 +08:00 |
gaoxin
|
7198279fcc
|
【bug】修复ScrollCycleView回收导致报错的问题
|
2021-03-04 21:01:21 +08:00 |
gaoxin
|
a578651df9
|
Merge branch 'xma/dev_temp' into xma/dev
|
2021-03-04 19:49:17 +08:00 |
gaoxin
|
d3a1cba41c
|
【管理】包配置管理加入
|
2021-03-04 19:29:15 +08:00 |
jiaoyangna
|
ba7a5fbb18
|
本地化提交
|
2021-03-04 19:04:33 +08:00 |
zhangqiang
|
3d9d5b0ed3
|
【20201001主题】
|
2021-03-04 16:58:28 +08:00 |
gaoxin
|
d31b9298df
|
【本地化】lua文本重新导出
|
2021-03-04 16:44:37 +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
|
f7a06a5783
|
竞技守卫修改
|
2021-03-02 18:05:06 +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 |
jiaoyangna
|
0182141c66
|
灵兽提交
|
2021-03-02 15:08:08 +08:00 |
zhangqiang
|
1604821615
|
【ScrollCycleView】修改5
|
2021-02-27 16:51:55 +08:00 |
zhangqiang
|
25f527f065
|
【ScrollCycleView】修改5
|
2021-02-26 14:52:59 +08:00 |
jiaoyangna
|
3f38b704be
|
已修改
|
2021-02-26 10:32:02 +08:00 |
gaoxin
|
c6430f59a5
|
【本地化】乾坤宝盒界面相关修改
|
2021-02-25 17:31:26 +08:00 |
jiaoyangna
|
0e80a3ee5a
|
玩家信息界面修改
|
2021-02-25 15:28:08 +08:00 |
zhangqiang
|
5699b89258
|
【ScrollCycleView】修改3
|
2021-02-25 12:04:31 +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
|
e42193d264
|
轩辕,森罗修改
|
2021-02-24 17:37:56 +08:00 |
ZhangBiao
|
fc7879a56a
|
【本地化】我要变强 首充
|
2021-02-24 11:47:07 +08:00 |
ZhangBiao
|
91f46cb250
|
【本地化】森罗幻境修改
|
2021-02-24 09:48:22 +08:00 |
jiaoyangna
|
576400a914
|
公会商店本地化修改提交
|
2021-02-23 20:50:34 +08:00 |
jiaoyangna
|
e4f4649cf9
|
文本提交
|
2021-02-20 18:01: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 |
jiaoyangna
|
05e1eceb99
|
属性图标修改
|
2021-02-19 17:50:10 +08:00 |
gaoxin
|
78e7305c15
|
【本地化】导出中文
|
2021-02-05 15:58:37 +08:00 |
gaoxin
|
927025f6de
|
【本地化】中文字还原,合并用
|
2021-02-05 12:44:50 +08:00 |
gaoxin
|
9559607b51
|
【本地化】部分扫光特效处理,充值界面妖精文字改图标
|
2021-01-28 15:37:44 +08:00 |
gaoxin
|
9816db8f36
|
【本地化】错误修正,添加GM测试功能引导
|
2021-01-28 11:42:05 +08:00 |
gaoxin
|
adf591cbec
|
【本地化】lua代码还原
|
2021-01-27 18:16:54 +08:00 |
gaoxin
|
c567dcd426
|
【本地化】代码本地化提交
|
2021-01-26 17:08:39 +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 |
jiaoyangna
|
aa8989ae73
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-21 13:44:23 +08:00 |
jiaoyangna
|
841e1e5bf5
|
【ID1012358】
【tips】拥有永久皮肤后再使用皮肤提示信息异常需要优化
|
2021-01-21 13:44:19 +08:00 |
zhangqiang
|
fc167398d6
|
【神将】神将上限999,继续通过碎片合成会导致游戏崩溃
|
2021-01-21 11:10:29 +08:00 |
zhangqiang
|
f6b4a710c8
|
【战斗回放】大闹天宫战斗后,在森罗幻境中查看战斗回放,播放的是大闹天宫回放
|
2021-01-18 15:50:56 +08:00 |
zhangqiang
|
2d8cf57a08
|
【车迟斗法】战斗后bug
|
2021-01-18 15:11:27 +08:00 |
DESKTOP-98AVA47\Administrator
|
c57a5ec8eb
|
【巅峰赛头像框修改】
|
2021-01-18 10:33:32 +08:00 |
gaoxin
|
3cbc165cf5
|
【森罗幻境】我方角色全部死亡,点击回春散使用按钮报错
|
2021-01-16 16:23:24 +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 |
jiaoyangna
|
d443fe2233
|
【ID1007787】
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
|
2021-01-15 15:27:21 +08:00 |
jiaoyangna
|
4ec81d52f4
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-15 10:50:32 +08:00 |
jiaoyangna
|
7666faad78
|
【ID1007787】
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
|
2021-01-15 10:50:27 +08:00 |
ZhangBiao
|
5ffab2b82a
|
【跳转返回】道具跳转后返回关闭道具详情界面
|
2021-01-14 17:07:45 +08:00 |
jiaoyangna
|
3a7324883e
|
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
|
2021-01-14 15:24:51 +08:00 |
jiaoyangna
|
76765a51a4
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-12 19:21:27 +08:00 |
jiaoyangna
|
be993c9905
|
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
|
2021-01-12 19:21:20 +08:00 |
zhangqiang
|
54c44d2983
|
【大闹天宫】已通关试炼节点,小人没往前走,或者挑战贪婪节点失败
|
2021-01-12 14:42:07 +08:00 |
zhangqiang
|
e90509b0ae
|
【战斗回放】 强制引导屏蔽回放按钮
|
2021-01-12 11:19:10 +08:00 |
gaoxin
|
f501e92272
|
【本地化】代码还原,合并用
|
2021-01-12 11:00:44 +08:00 |
gaoxin
|
13767fd26e
|
Merge branch 'master_xma_local' into gx/xma_local
|
2021-01-12 10:56:36 +08:00 |
gaoxin
|
ae7da93056
|
【本地化】还原文字
|
2021-01-12 10:56:26 +08:00 |
zhangqiang
|
e3ceaaccc4
|
【战斗回放】 强制新手引导屏蔽按钮
(cherry picked from commit 8d5d222639 )
|
2021-01-11 19:54:06 +08:00 |
zhangqiang
|
8d5d222639
|
【战斗回放】 强制新手引导屏蔽按钮
|
2021-01-11 19:44:59 +08:00 |
gaoxin
|
27b3c1ea32
|
【本地化】还原文本到代码中合并用
|
2021-01-09 14:20:06 +08:00 |
jiaoyangna
|
400376f7b7
|
【战斗回放】按钮显示修改
|
2021-01-08 19:23:53 +08:00 |
zhangqiang
|
bd14d812a3
|
【战斗回放】bug
|
2021-01-08 19:23:31 +08:00 |
zhangqiang
|
e12211eee4
|
【战斗回放】代码整理
|
2021-01-08 19:22:16 +08:00 |
zhangqiang
|
41ffad0c78
|
【战斗回放】车迟 十绝阵
|
2021-01-08 19:20:07 +08:00 |
zhangqiang
|
9f9b2920e3
|
【战斗回放】
|
2021-01-08 19:19:01 +08:00 |
jiaoyangna
|
6dbc555860
|
【战斗回放】按钮显示修改
|
2021-01-08 11:16:22 +08:00 |
jiaoyangna
|
dadda1ed7d
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-07 20:48:21 +08:00 |
jiaoyangna
|
a5a93d43a7
|
【ID1007787】
【优化】心魔试炼高级阶段奖励没有展示,添加层数奖励
|
2021-01-07 19:24:04 +08:00 |
zhangqiang
|
ecbde627e4
|
【战斗回放】bug
|
2021-01-07 18:03:57 +08:00 |
zhangqiang
|
1ef5728daf
|
【战斗回放】代码整理
|
2021-01-07 11:32:26 +08:00 |
zhangqiang
|
9cf814590a
|
【战斗回放】车迟 十绝阵
|
2021-01-06 21:04:37 +08:00 |
zhangqiang
|
7bedefc780
|
【战斗回放】
|
2021-01-06 16:12:54 +08:00 |
ZhangBiao
|
289177dba2
|
【0106抽卡修复】普通抽卡报错修复
(cherry picked from commit 254b22a75a893eaf9b1e792b83881e61f8e43d0f)
(cherry picked from commit 524e502773 )
|
2021-01-06 14:07:16 +08:00 |
ZhangBiao
|
524e502773
|
【0106抽卡修复】普通抽卡报错修复
(cherry picked from commit 254b22a75a893eaf9b1e792b83881e61f8e43d0f)
|
2021-01-06 14:00:13 +08:00 |
zhangqiang
|
33a7491279
|
【bug】
|
2021-01-04 16:47:04 +08:00 |
zhangqiang
|
694320d99c
|
Merge branch '0功能/1月6_版本优化' into master_develop
# Conflicts:
# Assets/Effect_ls_08_jinwu_attack_02.controller.meta
# Assets/ManagedResources/Atlas/DyAct_ShengXingYouLi/ArtFont.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_banner.png.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon1.png.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_icon2.png.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DyAct_SuoXiangPiMi/s_suoxiangpimi_zi.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon1.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/x_xiangyaoduobao_icon2.png.meta
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi.meta
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_beijin.jpg.meta
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhezhao.png.meta
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/x_xiangjianglaixi_zhuangbeidi.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/SuoXiangPiMi.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_banner.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon1.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiaLuXiangFeng/x_xialuxiangfeng_icon2.png.meta
# Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan.meta
# Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation.meta
# Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Animation/GameObject 7.controller.meta
# Assets/ManagedResources/EffectResSkill/Effect_buff_hunluan/Texture.meta
# Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller
# Assets/ManagedResources/EffectResSkill/Effect_ls_08_jinwu/Animation/Effect_ls_08_jinwu_attack_02_ctrl.controller.meta
# Assets/ManagedResources/Prefabs/UI/Bag/BagPanel.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab
# Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/RoleView.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
# Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialBomb.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# FontArt/ArtFont_zh/s_shengxingyouli_anniu_01_zh.png
# FontArt/ArtFont_zh/s_shengxingyouli_anniu_02_zh.png
# FontArt/中英文不一致资源/zh/s_shengxingyouli_banner_zh.png
|
2020-12-31 14:53:17 +08:00 |
zhangqiang
|
b3bd8f8fa6
|
【漏提】
|
2020-12-30 18:20:32 +08:00 |
zhangqiang
|
a6d16c13e5
|
【寻宝】加锁
|
2020-12-30 18:08:44 +08:00 |
jiaoyangna
|
0e8811df2b
|
【优化】背包中使用多个道具,明确标注数量
|
2020-12-30 11:02:44 +08:00 |
ZhangBiao
|
73aeaf3d89
|
【抽卡提示】六个抽卡分别加上妖晶提示
|
2020-12-29 14:24:45 +08:00 |
jiaoyangna
|
a8bcdf14f4
|
【优化】道具不能使用0个,且优化道具使用多个的上限(目前20过少)
|
2020-12-28 20:10:45 +08:00 |
ZhangBiao
|
48e05b927d
|
【装备出售】装备出售数量可以无限叠加和叠减,修改
|
2020-12-28 16:14:46 +08:00 |
ZhangBiao
|
becdc2dd88
|
【抽卡优化】连续十连或单抽也有确认提示
|
2020-12-28 15:46:22 +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 |
gaoxin
|
104505622a
|
Merge branch 'gx/xma_local' into master_xma_local
|
2020-12-26 18:28:21 +08:00 |
ZhangBiao
|
3516c10cc6
|
[森罗环境] 扎小怪计入击杀奖励
|
2020-12-24 17:16:33 +08:00 |
ZhangBiao
|
c5022043fd
|
【道具使用跳转】跳转后返回关闭弹窗界面
(cherry picked from commit 150ec3eb2f )
|
2020-12-24 16:43:37 +08:00 |
guowei
|
f25f253479
|
【合成优化修改】
|
2020-12-24 15:03:14 +08:00 |
guowei
|
df79f56b72
|
【优化五星成长礼包、心魔试炼礼包】
|
2020-12-24 13:52:28 +08:00 |
guowei
|
47cc019082
|
【拍脸优化】
|
2020-12-23 14:54:53 +08:00 |
ZhangBiao
|
02fe110563
|
【社稷大典】公会检查跳转失败修复
(cherry picked from commit 6d5a9f9f42 )
|
2020-12-23 11:38:00 +08:00 |
ZhangBiao
|
f7f0d4099f
|
【降妖夺宝】结束
|
2020-12-23 10:34:47 +08:00 |
guowei
|
fcb2e4604a
|
【优化】提交
|
2020-12-23 10:10:48 +08:00 |
gaoxin
|
03e3d77bb6
|
【优化】橙色改为金色
|
2020-12-21 16:15:17 +08:00 |
ZhangBiao
|
223b816a98
|
【青龙秘宝】青龙秘宝等级购买报错修复
|
2020-12-18 11:38:47 +08:00 |
zhangqiang
|
74df46d7a8
|
【套装属性】 bug修改
|
2020-12-14 17:51:44 +08:00 |
zhangqiang
|
03e0e73665
|
【装备套装】 套装属性向下兼容
|
2020-12-11 17:31:11 +08:00 |
ZhangBiao
|
1c7ac7e8cc
|
【青龙秘宝】修复延时
(cherry picked from commit 758c59dcae )
|
2020-12-07 19:18:04 +08:00 |
gaoxin
|
8eb823937e
|
【系统消息】暂时屏蔽法宝详情的显示
|
2020-11-27 15:06:58 +08:00 |
gaoxin
|
ad9c72717a
|
【系统消息】修改系统消息点击法宝相关消息显示为一级的法宝信息
|
2020-11-27 10:49:20 +08:00 |
ZhangBiao
|
9601af33e7
|
【神将详情】排行榜查看他人装备显示出售按钮修复
|
2020-11-16 16:20:15 +08:00 |
ZhangBiao
|
8df6de20e5
|
【副本】isInMap字段删除bug修复
|
2020-11-16 15:24:09 +08:00 |
ZhangBiao
|
8a5d51e2a3
|
【灵兽抽卡】增加可选灵兽
(cherry picked from commit 8185be7c27 )
|
2020-11-13 12:12:44 +08:00 |
zhangqiang
|
492d969a4f
|
【觉醒】bug 修改 公会成员灵兽显示错误
|
2020-11-12 14:38:40 +08:00 |
zhangqiang
|
0ca5e4ea13
|
【觉醒】bug
|
2020-11-11 20:21:37 +08:00 |