zhangqiang
|
fe8da6eada
|
【限时活动】
|
2021-03-04 23:14:42 +08:00 |
zhangqiang
|
1cfa70da67
|
【主题活动】
|
2021-03-04 22:56:51 +08:00 |
zhangqiang
|
7770865a40
|
【主题活动修改】
|
2021-03-04 22:15:24 +08:00 |
zhangqiang
|
d249f78e8f
|
【灵兽特惠】
|
2021-03-04 21:22:02 +08:00 |
gaoxin
|
30083c2449
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 21:01:26 +08:00 |
gaoxin
|
7198279fcc
|
【bug】修复ScrollCycleView回收导致报错的问题
|
2021-03-04 21:01:21 +08:00 |
zhangqiang
|
e97fd92b92
|
【乾坤宝盒单抽卡死】
|
2021-03-04 20:35: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
|
f3fba14341
|
【点金排行榜】
|
2021-03-04 17:37:53 +08:00 |
jiaoyangna
|
8325cf0537
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 17:02:04 +08:00 |
jiaoyangna
|
09870ee552
|
除了中文其他语言不播音效
|
2021-03-04 17:02:00 +08:00 |
zhangqiang
|
3d9d5b0ed3
|
【20201001主题】
|
2021-03-04 16:58:28 +08:00 |
gaoxin
|
999e8e8cf4
|
Merge branch 'xma/dev' into xma/dev_temp
|
2021-03-04 16:51:55 +08:00 |
gaoxin
|
6f4a793bc5
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 16:47:57 +08:00 |
gaoxin
|
d31b9298df
|
【本地化】lua文本重新导出
|
2021-03-04 16:44:37 +08:00 |
jiaoyangna
|
0991575155
|
提示修改
|
2021-03-04 16:43:47 +08:00 |
zhangqiang
|
86fd6724c1
|
【圣物选择】
|
2021-03-04 14:58:41 +08:00 |
jiaoyangna
|
b3af8709ae
|
巅峰赛帮助文本修改
|
2021-03-04 14:28:46 +08:00 |
gaoxin
|
7d2a90fd90
|
Merge remote-tracking branch 'origin/gx/local_热更配置' into xma/dev
# Conflicts:
# AssetBundles/version.txt
|
2021-03-04 13:47:59 +08:00 |
ZhangBiao
|
052767a836
|
【本地化】鸿蒙阵修改
|
2021-03-04 11:05:19 +08:00 |
ZhangBiao
|
7805c09f4d
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 10:16:42 +08:00 |
ZhangBiao
|
7d678094a3
|
【本地化】
|
2021-03-04 10:16:31 +08:00 |
jiaoyangna
|
90a87ee396
|
本地化 提交
|
2021-03-04 10:16:07 +08:00 |
ZhangBiao
|
4861711fbc
|
【本地化】
|
2021-03-03 18:25:34 +08:00 |
jiaoyangna
|
ef65fb91f4
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-03 17:46:19 +08:00 |
jiaoyangna
|
cf5300bab2
|
图片提交
|
2021-03-03 17:46:08 +08:00 |
zhangqiang
|
1e1c325229
|
【神将】
|
2021-03-03 17:45:34 +08:00 |
ZhangBiao
|
f01cdd582e
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-03 17:04:26 +08:00 |
ZhangBiao
|
6fe7b9ed28
|
【本地化】
|
2021-03-03 17:04:17 +08:00 |
zhangqiang
|
1ffe352007
|
【灵兽】
|
2021-03-03 16:59:52 +08:00 |
zhangqiang
|
59c2caaede
|
【送神祠本地化修改】
|
2021-03-03 15:51:04 +08:00 |
ZhangBiao
|
09b534b44f
|
【本地化】
|
2021-03-03 15:36:17 +08:00 |
jiaoyangna
|
c6f716f1ba
|
主城修改
|
2021-03-03 14:19:34 +08:00 |
ZhangBiao
|
caaf50cf91
|
【本地化】
|
2021-03-03 11:30:06 +08:00 |
ZhangBiao
|
ff70c8d635
|
【本地化】竞技场 积天豪礼
|
2021-03-03 10:07:13 +08:00 |
jiaoyangna
|
0851e8e1b8
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-02 21:06:46 +08:00 |
jiaoyangna
|
ea6e1f242c
|
灵兽界面修改提交
|
2021-03-02 21:06:42 +08:00 |
ZhangBiao
|
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 |
gaoxin
|
d124d59f1b
|
【配置】完善逻辑并应用
|
2021-03-02 15:18:06 +08:00 |
jiaoyangna
|
988c8b514e
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-02 15:08:29 +08:00 |
jiaoyangna
|
0182141c66
|
灵兽提交
|
2021-03-02 15:08:08 +08:00 |
ZhangBiao
|
e6a076afa8
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-02 14:45:52 +08:00 |