ZhangBiao
|
2df3ac159c
|
【限时活动】完成?删除loggreen
|
2021-04-21 16:36:12 +08:00 |
gaoxin
|
30b329a837
|
【ios】图片回收
|
2021-04-21 13:12:04 +08:00 |
zhangqiang
|
f4ca18ff74
|
【日常副本优化】首次挑战副本不再消耗次数
|
2021-04-21 11:45:55 +08:00 |
JLIOSM1
|
c31a82ef7f
|
【ios】lua文件格式修改
|
2021-04-20 13:58:00 +08:00 |
zhangqiang
|
7aefe7f4db
|
【日常副本】“今日剩余次数”修改为“今日剩余免费次数”
|
2021-04-20 11:19:17 +08:00 |
wangzhenxing
|
c544767e29
|
[功能]===========新手引导提交,心魔试炼排行榜添加玩家信息
|
2021-04-16 14:09:36 +08:00 |
jiaoyangna
|
071a91773a
|
导出 文本提交
|
2021-04-09 12:26:35 +08:00 |
jiaoyangna
|
8291a48e73
|
Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
# Assets/ManagedResources/Icon/ChengHao.meta
# Assets/ManagedResources/Icon/ZuoQi.meta
# Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
# Assets/ManagedResources/~Lua/View/FetterItem.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-04-09 12:24:01 +08:00 |
jiaoyangna
|
0ab7c3177a
|
还原文字提交
|
2021-04-09 12:06:17 +08:00 |
jiaoyangna
|
38e64fb774
|
还原文字提交
|
2021-04-09 11:39:09 +08:00 |
jiaoyangna
|
6db7d3ac5c
|
车迟斗法开启提示修改
|
2021-04-09 11:11:25 +08:00 |
ZhangBiao
|
bfaa5195b5
|
Revert "【表删除】报错处理"
This reverts commit b163fc3035.
|
2021-04-07 11:54:39 +08:00 |
ZhangBiao
|
c9f0efe3f6
|
【无尽森罗】无法进入修改
|
2021-04-07 11:35:48 +08:00 |
gaoxin
|
9033d47109
|
【本地化】文本导出
|
2021-04-06 22:33:57 +08:00 |
gaoxin
|
d90b9145b8
|
Merge remote-tracking branch 'origin/gx/china/dev_tr' into xma/dev-b
|
2021-04-06 15:24:46 +08:00 |
gaoxin
|
cf5a2a46fa
|
【本地化】还原文本到代码种
|
2021-04-06 15:23:27 +08:00 |
gaoxin
|
b163fc3035
|
【表删除】报错处理
|
2021-04-06 15:16:37 +08:00 |
zhangqiang
|
0b85a85e18
|
【大闹天宫】 间隔阶段重登提示有问题
|
2021-04-06 15:11:29 +08:00 |
gaoxin
|
472829239e
|
【表删除】AccomplishmentConfig
|
2021-04-02 14:46:31 +08:00 |
gaoxin
|
b53717c9ee
|
【本地化】还原文本
|
2021-04-01 18:41:50 +08:00 |
ZhangBiao
|
94714c1ce4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-31 13:32:44 +08:00 |
ZhangBiao
|
beee0ed0b3
|
【适配】无尽副本
|
2021-03-31 13:32:23 +08:00 |
zhangqiang
|
3b7b310c8b
|
【适配】
|
2021-03-31 12:00:55 +08:00 |
jiaoyangna
|
ad24255948
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-03-30 21:02:36 +08:00 |
gaoxin
|
6e34c88fa5
|
【人物信息栏】修复战力刷新不及时的问题
|
2021-03-30 20:46:47 +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 |
gaoxin
|
c2a5c2dc17
|
【特权优化】将界面顶部的特权等级移回-挂机,副本界面修啊给i
|
2021-03-30 19:54:19 +08:00 |
jiaoyangna
|
c2fac79eca
|
活动 提交
|
2021-03-30 18:26:10 +08:00 |
gaoxin
|
0688f20ad6
|
【心魔试炼】排行榜有空格
|
2021-03-27 15:32:59 +08:00 |
jiaoyangna
|
3fe1267e86
|
功能隐藏
(cherry picked from commit 2f2cf25801)
|
2021-03-16 17:43:59 +08:00 |
jiaoyangna
|
8ec9b44626
|
功能不进版本隐藏按钮
(cherry picked from commit 0b538b6e1e)
|
2021-03-16 17:38:29 +08:00 |
jiaoyangna
|
838de7cd1c
|
文字提交
|
2021-03-12 14:31:52 +08:00 |
jiaoyangna
|
1cd3d4cdaa
|
文字提交
|
2021-03-12 14:20:14 +08:00 |
jiaoyangna
|
cf3c571182
|
Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
|
2021-03-08 11:14:15 +08:00 |
jiaoyangna
|
02ca65089f
|
Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Harmony.meta
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
|
2021-03-08 10:27:14 +08:00 |
jiaoyangna
|
955bd044f1
|
四灵提交
|
2021-03-01 18:35:35 +08:00 |
zhangqiang
|
1604821615
|
【ScrollCycleView】修改5
|
2021-02-27 16:51:55 +08:00 |
zhangqiang
|
545dee3df1
|
【ScrollCycleView】修改4
|
2021-02-26 10:37:39 +08:00 |
zhangqiang
|
dc42a492e7
|
【排行榜优化】排行榜信息分页读取
|
2021-02-24 10:13:43 +08:00 |
zhangqiang
|
e8ee62f9ab
|
【大闹天宫】重置提示错误
|
2021-02-23 10:40:58 +08:00 |
DESKTOP-98AVA47\Administrator
|
12c7f9293f
|
【本地化】
|
2021-01-29 13:22:50 +08:00 |
DESKTOP-98AVA47\Administrator
|
3878baa2eb
|
【本地化】鸿蒙结果文字位置 兽潮排行层数文字
|
2021-01-29 12:28:16 +08:00 |
gaoxin
|
022444dffa
|
【bug】修复副本界面在全面屏下ui变小的问题
|
2021-03-07 15:46:19 +08:00 |
gaoxin
|
d31b9298df
|
【本地化】lua文本重新导出
|
2021-03-04 16:44:37 +08:00 |
jiaoyangna
|
90a87ee396
|
本地化 提交
|
2021-03-04 10:16:07 +08:00 |
ZhangBiao
|
6fe7b9ed28
|
【本地化】
|
2021-03-03 17:04:17 +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
|
e42193d264
|
轩辕,森罗修改
|
2021-02-24 17:37:56 +08:00 |
ZhangBiao
|
f98e81bb37
|
【本地化】无尽副本界面左上右上调整
|
2021-02-23 20:57:26 +08:00 |
jiaoyangna
|
e4f4649cf9
|
文本提交
|
2021-02-20 18:01:57 +08:00 |
jiaoyangna
|
602dbc924c
|
文本还原
|
2021-02-20 16:43:44 +08:00 |
gaoxin
|
78e7305c15
|
【本地化】导出中文
|
2021-02-05 15:58:37 +08:00 |
gaoxin
|
927025f6de
|
【本地化】中文字还原,合并用
|
2021-02-05 12:44:50 +08:00 |
gaoxin
|
adf591cbec
|
【本地化】lua代码还原
|
2021-01-27 18:16:54 +08:00 |
gaoxin
|
c567dcd426
|
【本地化】代码本地化提交
|
2021-01-26 17:08:39 +08:00 |
jiaoyangna
|
8e0047d5e8
|
Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
|
2021-01-26 14:48:06 +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
|
344ec52500
|
【巅峰赛头像修改】
|
2021-01-18 15:07:23 +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
|
3e99568f24
|
红点提交
|
2021-01-13 14:44:37 +08:00 |
jiaoyangna
|
5e90700036
|
Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容
|
2021-01-13 14:30:00 +08:00 |
jiaoyangna
|
687c5fa957
|
红点提交
|
2021-01-13 14:29:56 +08:00 |
ZhangBiao
|
a75d553a6a
|
【无尽副本】世界等级显示1级 修改
|
2021-01-13 11:04:28 +08:00 |
gaoxin
|
f501e92272
|
【本地化】代码还原,合并用
|
2021-01-12 11:00:44 +08:00 |
gaoxin
|
ae7da93056
|
【本地化】还原文字
|
2021-01-12 10:56:26 +08:00 |
gaoxin
|
27b3c1ea32
|
【本地化】还原文本到代码中合并用
|
2021-01-09 14:20:06 +08:00 |
ZhangBiao
|
2fed5ddb45
|
【森罗幻境】进入森罗幻境后直接关闭选择神将弹窗,会在离开幻境前闪过一个统计弹窗 修复
|
2021-01-04 11:04:37 +08:00 |
ZhangBiao
|
574a0da116
|
【编队】进入无尽副本后 主线编队无法上阵20级以下英雄修复
|
2020-12-29 10:24:50 +08:00 |
jiaoyangna
|
0d40e26a34
|
副本红点修改
|
2020-12-28 10:03:24 +08:00 |
ZhangBiao
|
49dc0f172c
|
【无尽副本】重置事件点无法触碰修复
(cherry picked from commit e5b00c5cd9)
|
2020-12-24 18:01:11 +08:00 |
jiaoyangna
|
c4a0cab9a8
|
Merge branch '0功能/建木神树' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2020-12-21 10:46:53 +08:00 |
jiaoyangna
|
5aa171267d
|
四灵协议提交
|
2020-12-21 09:51:08 +08:00 |
ZhangBiao
|
0692fbf799
|
【森罗幻境】重置事件点不触发修复
(cherry picked from commit c50ba93285)
|
2020-12-18 12:02:42 +08:00 |
ZhangBiao
|
45b8899cfe
|
【建木神树】排行榜查看其他人信息
|
2020-12-16 13:49:56 +08:00 |
jiaoyangna
|
4519f70c54
|
四灵试炼commit
|
2020-12-14 09:54:50 +08:00 |
ZhangBiao
|
4c73219b39
|
【森罗幻境】诸多bug 修复
|
2020-12-12 18:00:18 +08:00 |
jiaoyangna
|
20564aee0f
|
【日常副本】解锁所有副本后,没有自动滚动到最后一个副本
|
2020-11-19 15:28:21 +08:00 |
ZhangBiao
|
8df6de20e5
|
【副本】isInMap字段删除bug修复
|
2020-11-16 15:24:09 +08:00 |
ZhangBiao
|
e3bd86ef08
|
轩辕 修改 提交
(cherry picked from commit 27f8331e62)
|
2020-10-19 21:25:12 +08:00 |
jiaoyangna
|
8c5132185b
|
轩辕宝镜黑屏问题解决
|
2020-10-10 16:05:02 +08:00 |
gaoxin
|
8e3e25a450
|
修复无尽副本过渡期间依然可以进入的问题
|
2020-10-13 22:32:37 +08:00 |
jiaoyangna
|
e7a695553f
|
轩辕宝镜关闭时销毁时间
|
2020-10-24 09:44:56 +08:00 |
zhangqiang
|
297d71d2ff
|
线上问题 无尽副本轮换前5分钟无法进入
|
2020-10-09 15:21:00 +08:00 |
jiaoyangna
|
c7836b8aea
|
编队界面修改提交
|
2020-09-28 21:08:12 +08:00 |
JieLing
|
bd21a12b98
|
轩辕commit
|
2020-09-28 15:08:35 +08:00 |
JieLing
|
b7cd64f977
|
开服狂欢不可完成奖励修改,日常任务弹活动关闭异常
|
2020-09-28 14:11:00 +08:00 |
jiaoyangna
|
947d647266
|
轩辕修改提交
|
2020-09-27 20:40:30 +08:00 |
gaoxin
|
b3d15c1945
|
头像特效添加
|
2020-09-27 16:58:10 +08:00 |
ZhangBiao
|
63cde2092d
|
无尽副本界面动效增加
|
2020-09-04 17:46:27 +08:00 |
zhangqiang
|
571b8e082a
|
shipei
|
2020-09-02 17:38:56 +08:00 |
jiaoyangna
|
35712b99de
|
xuanyuan commit
|
2020-09-02 15:31:02 +08:00 |
jiaoyangna
|
8d11549d86
|
大闹天宫红点修改
|
2020-09-09 10:30:39 +08:00 |
jiaoyangna
|
8d19f5c583
|
prefab commit
|
2020-09-09 10:11:47 +08:00 |
jiaoyangna
|
933aadbf65
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-09-01 18:36:18 +08:00 |
jiaoyangna
|
00b75cc097
|
prefab commit
|
2020-09-01 18:36:14 +08:00 |
gaoxin
|
97eaf77009
|
主界面底部界面经验条显示调整
|
2020-09-01 17:12:00 +08:00 |
ZhangBiao
|
e74c120d01
|
大闹天宫重置红点、无尽副本界面红点
|
2020-09-01 11:25:38 +08:00 |
jiaoyangna
|
2bf39b8a9c
|
副本红点提交
|
2020-08-31 15:01:20 +08:00 |
jiaoyangna
|
366343b72b
|
副本红点修改提交
|
2020-08-31 13:58:47 +08:00 |
jiaoyangna
|
0806d1d497
|
在副本未开启时不显示红点
|
2020-08-31 10:39:56 +08:00 |
ZhangBiao
|
a99aa6ef6e
|
还是红点检测
|
2020-08-28 17:29:38 +08:00 |
ZhangBiao
|
0c3b0e6326
|
车迟斗法副本界面红点
|
2020-08-28 16:35:08 +08:00 |
ZhangBiao
|
021a7dc5a7
|
森罗换层卡死问题修复
|
2020-08-27 18:15:53 +08:00 |
ZhangBiao
|
52643c3937
|
大闹天宫入口开启修改
|
2020-08-27 15:18:17 +08:00 |
ZhangBiao
|
811418e222
|
森罗 无尽红点
|
2020-08-27 13:59:14 +08:00 |
ZhangBiao
|
1e4f936810
|
无尽副本迷雾显示问题修改,无尽副本界面步数显示问题修复
|
2020-08-27 10:49:44 +08:00 |
gaoxin
|
db0a09ab68
|
修复副本界面通关后战斗力背景图标不关闭的问题
|
2020-08-26 22:37:31 +08:00 |
jiaoyangna
|
1482d308cb
|
日常副本修改
|
2020-08-26 20:37:31 +08:00 |
gaoxin
|
4b41b5def9
|
副本界面显示优化
|
2020-08-26 20:20:40 +08:00 |
jiaoyangna
|
a52ea7f6b7
|
qinglong commit
|
2020-08-26 14:04:26 +08:00 |
gaoxin
|
d73b816bb3
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
|
2020-08-26 12:26:33 +08:00 |
gaoxin
|
b0222ccd61
|
艺术字体替换,美元显示优化
|
2020-08-26 12:26:19 +08:00 |
jiaoyangna
|
78ea78303d
|
日常 轩辕 列表优化
|
2020-08-26 12:23:10 +08:00 |
jiaoyangna
|
59204790d2
|
xuanyuan commit
|
2020-08-26 10:58:41 +08:00 |
zhangqiang
|
2ea0c63999
|
日常副本
|
2020-08-25 18:39:57 +08:00 |
zhangqiang
|
060cc081bb
|
修改bug
|
2020-08-25 17:50:52 +08:00 |
zhangqiang
|
4d19e7ce98
|
中文表导出提交
|
2020-08-25 15:46:38 +08:00 |
gaoxin
|
e806410e8a
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2020-08-24 15:25:23 +08:00 |
ZhangBiao
|
939fa0227a
|
无尽入口例会、化虚进入修复、剪影仙踪
|
2020-08-24 15:20:00 +08:00 |
gaoxin
|
4f8026425d
|
sdk添加上传新手数据的接口
|
2020-08-22 19:14:58 +08:00 |
ZhangBiao
|
8de86ce4ac
|
无尽副本入口
|
2020-08-22 17:05:37 +08:00 |
gaoxin
|
af532fce6e
|
海外相关修改合并
|
2020-08-22 16:19:50 +08:00 |
ZhangBiao
|
f9ffc1aa39
|
无尽细节修改
|
2020-08-19 19:37:59 +08:00 |
ZhangBiao
|
32eadd13ef
|
试炼
|
2020-08-19 17:18:38 +08:00 |
ZhangBiao
|
8f786147d3
|
|
2020-08-18 16:36:24 +08:00 |
ZhangBiao
|
448c5d3b17
|
无尽_新重做前的提交
|
2020-08-18 15:48:41 +08:00 |
ZhangBiao
|
c9cb029494
|
无尽副本基本功能
(cherry picked from commit 21f43fa1a132a469c1d674d12838148699998794)
|
2020-08-18 10:49:21 +08:00 |
ZhangBiao
|
9f8b553626
|
试炼副本补日志
(cherry picked from commit 47e547d31f282e772674a8b17617fcd931693492)
|
2020-08-18 10:46:33 +08:00 |
jiaoyangna
|
3e9fcb7e71
|
xuanyuan update
|
2020-08-18 10:33:19 +08:00 |
jiaoyangna
|
92447e21a8
|
列表优化提交
|
2020-08-18 10:22:24 +08:00 |
jiaoyangna
|
7ff435c765
|
xuanyuan update
|
2020-08-17 15:48:40 +08:00 |
jiaoyangna
|
740eb7253d
|
xuanyuan commit
|
2020-08-14 20:41:07 +08:00 |
jiaoyangna
|
84f82d488d
|
live2d commit
|
2020-08-14 17:43:24 +08:00 |
jiaoyangna
|
0b157b6ee8
|
轩辕宝镜入口替换
|
2020-08-14 16:09:00 +08:00 |
jiaoyangna
|
4604df2d0b
|
修改轩辕副本立绘
|
2020-08-14 14:36:24 +08:00 |
jiaoyangna
|
40b9550c54
|
修改轩辕副本立绘提交
|
2020-08-14 14:35:48 +08:00 |
jiaoyangna
|
1f7b161087
|
五星成长礼修改提交
|
2020-08-14 13:32:55 +08:00 |
jiaoyangna
|
b2f5dbc2ca
|
xuanyuan update
|
2020-08-13 14:43:44 +08:00 |
jiaoyangna
|
937d46ff75
|
xuanyuan commit
|
2020-08-12 21:10:47 +08:00 |
jiaoyangna
|
a9ebd162ec
|
轩辕 提交
|
2020-08-12 21:10:36 +08:00 |
jiaoyangna
|
39fb3d113c
|
xuyuan commit
|
2020-08-12 21:10:27 +08:00 |
jiaoyangna
|
96d47d34a8
|
Merge branch 'master_develop2' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua
# data_execl/base_data/GlobalSystemConfig.xlsx
# data_execl/base_data/ItemConfig.xlsx
# data_execl/base_data/RechargeCommodityConfig.xlsx
|
2020-08-12 14:17:01 +08:00 |
jiaoyangna
|
7bee1280b3
|
xuanyuan update
|
2020-08-12 14:13:28 +08:00 |
jiaoyangna
|
e372c84cdb
|
xuanyuan
|
2020-08-12 13:34:07 +08:00 |
zhangqiang
|
b67b99ad93
|
无尽副本临时新增入口
|
2020-08-11 16:31:17 +08:00 |
jiaoyangna
|
9f186311b3
|
xuanyuan
|
2020-08-11 15:11:33 +08:00 |
jiaoyangna
|
16e1699e65
|
no message
|
2020-08-11 11:58:41 +08:00 |
jiaoyangna
|
179632ca21
|
no message
|
2020-08-11 11:56:03 +08:00 |
jiaoyangna
|
6f05841519
|
no message
|
2020-08-11 11:00:30 +08:00 |
jiaoyangna
|
dc058f99e1
|
no message
|
2020-08-11 10:13:50 +08:00 |
jiaoyangna
|
3d2f288934
|
轩辕宝镜提交
|
2020-08-11 09:48:21 +08:00 |
jiaoyangna
|
16d4b6477d
|
no message
|
2020-08-06 17:37:07 +08:00 |
jiaoyangna
|
e0359bb37a
|
encoding upate
|
2020-08-06 17:52:32 +08:00 |
jiaoyangna
|
c095459166
|
no message
|
2020-08-05 21:01:20 +08:00 |
lihaiyang
|
a6f1259075
|
Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into xuanyuanbaojing
|
2020-08-05 18:06:28 +08:00 |
gaoxin
|
195a48d3fe
|
副本添加最大战斗力判断
|
2020-08-05 16:26:45 +08:00 |
jiaoyangna
|
c5bced9968
|
副本修改提交
|
2020-08-05 15:00:56 +08:00 |
zhangqiang
|
54148395b4
|
日常副本判断开启临时添加战力计算
|
2020-08-07 06:06:55 +08:00 |
ZhangBiao
|
ee28c18254
|
森罗bug修复
|
2020-08-04 20:22:56 +08:00 |
ZhangBiao
|
9b28e7c140
|
森罗bug修改
|
2020-08-03 16:59:37 +08:00 |
ZhangBiao
|
434aaeccff
|
魂印特效 无用log删除
|
2020-08-03 15:20:18 +08:00 |
jiaoyangna
|
242896fede
|
add soulprint effect commit
|
2020-08-02 09:16:45 +08:00 |
jiaoyangna
|
b54534db2f
|
chechihongdian update
|
2020-07-29 18:27:07 +08:00 |
jiaoyangna
|
c78cebde62
|
hongdianjiance tijao
|
2020-07-29 18:16:11 +08:00 |
jiaoyangna
|
66bfd4f4c9
|
车迟提交
|
2020-07-29 17:53:39 +08:00 |
jiaoyangna
|
b2af34a2b3
|
副本红点提交
|
2020-07-29 17:50:15 +08:00 |
jiaoyangna
|
36070bc0c0
|
cardelaycarbon update
|
2020-07-28 22:25:51 +08:00 |
ZhangBiao
|
fb5d81a7a4
|
bug修复
|
2020-07-28 21:18:40 +08:00 |
jiaoyangna
|
0a73f284ef
|
carbon detail update
|
2020-07-28 20:58:28 +08:00 |
jiaoyangna
|
5d70187da8
|
副本修改提交
|
2020-07-28 20:51:28 +08:00 |
jiaoyangna
|
43ee7dd577
|
限时召唤提交
|
2020-07-28 20:09:41 +08:00 |
ZhangBiao
|
ee79439f39
|
万象境 bug修复
|
2020-07-28 10:42:29 +08:00 |
jiaoyangna
|
b6c2b22a3d
|
【日常副本优化】每个日常副本标题下方增加副本描述文字
|
2020-07-27 20:34:59 +08:00 |
jiaoyangna
|
54b3aad5e9
|
【副本优化】副本入口处增加文字提示
|
2020-07-27 19:48:05 +08:00 |
JieLing
|
0670160fd3
|
修复森罗幻境入口白片问题
|
2020-07-26 16:35:38 +08:00 |
jiaoyangna
|
b1bf2876cb
|
10 star update
|
2020-07-25 21:57:46 +08:00 |
gaoxin
|
b0002cf781
|
语言文字替换
|
2020-07-25 20:42:11 +08:00 |
jiaoyangna
|
7c92ddc60a
|
副本置灰修改提交
|
2020-07-25 18:35:05 +08:00 |
jiaoyangna
|
b424927bbb
|
tupian tijiao
|
2020-07-23 16:01:26 +08:00 |
jiaoyangna
|
aefa2b0cac
|
添加一个万象境的入口列表
|
2020-07-23 15:42:42 +08:00 |
jiaoyangna
|
cafa630185
|
Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2020-07-22 20:19:57 +08:00 |
jiaoyangna
|
03107d240a
|
轩辕宝镜提交
|
2020-07-21 10:42:20 +08:00 |
ZhangBiao
|
9ed616d8be
|
|
2020-07-21 09:38:34 +08:00 |
jiaoyangna
|
04e9a24db0
|
xuanyuanmirror tijiao
|
2020-07-20 19:46:08 +08:00 |
jiaoyangna
|
b11c108e5d
|
Merge branch 'master_develop' into xuanyuanbaojing
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
|
2020-07-20 09:47:28 +08:00 |
jiaoyangna
|
1838823c37
|
幸运探宝提交
|
2020-07-16 20:24:28 +08:00 |
ZhangBiao
|
cb56ec6b22
|
森罗小游戏bug修改
|
2020-07-16 16:59:46 +08:00 |
jiaoyangna
|
e15bf9a7b2
|
轩辕宝镜资源提交
|
2020-07-15 16:27:58 +08:00 |
ZhangBiao
|
310802e967
|
language导出
|
2020-07-10 19:13:29 +08:00 |
JieLing
|
b3c70f66e4
|
svn逻辑tongbu
|
2020-07-01 18:14:03 +08:00 |
JieLing
|
d08552ca2f
|
外网0.16.13 内网0.15.24
|
2020-06-30 18:59:44 +08:00 |
JieLing
|
7382b2db77
|
版本开发提交
|
2020-06-28 17:52:29 +08:00 |
JieLing
|
8c61581548
|
外网 0.16.10 内网 0.15.23
|
2020-06-28 17:48:49 +08:00 |
JieLing
|
d87ab3767e
|
内网 0.15.20
|
2020-06-23 18:36:24 +08:00 |