gaoxin
|
99e373bda2
|
【协议】修复登录成功确认协议丢失
|
2021-03-05 14:53:03 +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
|
38d5687359
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-05 14:32:40 +08:00 |
ZhangBiao
|
8dadc2d54b
|
【本地化】随机名字本地化
|
2021-03-05 14:32:29 +08:00 |
zhangqiang
|
5c641ef598
|
【灵兽主界面等级 + 升级成功】
|
2021-03-05 14:13:13 +08:00 |
jiaoyangna
|
d1f18c39b3
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-05 14:01:03 +08:00 |
jiaoyangna
|
7c5fd4408e
|
本地化提交
|
2021-03-05 14:00:45 +08:00 |
zhangqiang
|
fec790a1e0
|
【宝物强化】
|
2021-03-05 13:54:08 +08:00 |
zhangqiang
|
a0f81de2ce
|
灵兽最大等级白片
|
2021-03-05 12:15:39 +08:00 |
jiaoyangna
|
6a777d71c6
|
十绝阵文字重叠提交
|
2021-03-05 11:58:29 +08:00 |
jiaoyangna
|
28582fb4f6
|
本地化
|
2021-03-05 11:51:30 +08:00 |
jiaoyangna
|
37e5733d1a
|
本地化
|
2021-03-05 11:45:42 +08:00 |
zhangqiang
|
1364517cfb
|
修改
|
2021-03-05 11:27:28 +08:00 |
jiaoyangna
|
32618d66bf
|
神衣天降修改
|
2021-03-05 09:57:11 +08:00 |
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 |
jiaoyangna
|
1acfbabcde
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 21:33:24 +08:00 |
jiaoyangna
|
29f1ae90e0
|
预设提交
|
2021-03-04 21:33:19 +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
|
8750406dfc
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 20:19:42 +08:00 |
gaoxin
|
0c29596eb1
|
【配置】服务器配置还原到version.txt中
|
2021-03-04 20:19:26 +08:00 |
zhangqiang
|
a29e0db487
|
【主题活动】
|
2021-03-04 20:18:37 +08:00 |
jiaoyangna
|
21e0998228
|
图片提交
|
2021-03-04 20:17:22 +08:00 |
gaoxin
|
099c0603bb
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 19:59:36 +08:00 |
zhangqiang
|
0f25668d0f
|
【1008主题活动修改】
|
2021-03-04 19:50:26 +08:00 |
gaoxin
|
a578651df9
|
Merge branch 'xma/dev_temp' into xma/dev
|
2021-03-04 19:49:17 +08:00 |
gaoxin
|
1c210301fd
|
【本地化】后端写死文本改为表配置
|
2021-03-04 19:48:38 +08:00 |
gaoxin
|
d3a1cba41c
|
【管理】包配置管理加入
|
2021-03-04 19:29:15 +08:00 |
jiaoyangna
|
ba7a5fbb18
|
本地化提交
|
2021-03-04 19:04:33 +08:00 |
zhangqiang
|
0b9394188a
|
【修改
|
2021-03-04 19:03:09 +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
|
abad647f16
|
【本地化】新增资源导入
|
2021-03-04 16:47:35 +08:00 |
gaoxin
|
265fb5684e
|
删除奇怪的资源文件
|
2021-03-04 16:44:55 +08:00 |
gaoxin
|
999010d8ca
|
冗余资源删除
|
2021-03-04 16:44:49 +08:00 |
gaoxin
|
d31b9298df
|
【本地化】lua文本重新导出
|
2021-03-04 16:44:37 +08:00 |
jiaoyangna
|
0991575155
|
提示修改
|
2021-03-04 16:43:47 +08:00 |
jiaoyangna
|
7a6808a8d1
|
图片提交
|
2021-03-04 16:05:43 +08:00 |
zhangqiang
|
249cddb935
|
【显示兑换】
|
2021-03-04 15:18:31 +08:00 |
zhangqiang
|
6bbb1c7671
|
Revert "【新live2】导入 缺25"
This reverts commit 7d8145a3b9.
|
2021-03-04 15:16:46 +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 |
zhangqiang
|
7d8145a3b9
|
【新live2】导入 缺25
|
2021-03-04 11:44:19 +08:00 |
ZhangBiao
|
2d8acdfcd9
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-04 11:05:28 +08:00 |
ZhangBiao
|
052767a836
|
【本地化】鸿蒙阵修改
|
2021-03-04 11:05:19 +08:00 |
jiaoyangna
|
f309c54436
|
导出代码和预设的翻译表
|
2021-03-04 11:04:47 +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
|
a7e578eea8
|
【本地化】
|
2021-03-03 18:31:18 +08:00 |
ZhangBiao
|
4861711fbc
|
【本地化】
|
2021-03-03 18:25:34 +08:00 |
ZhangBiao
|
37dcb0d6ad
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-03 18:07:38 +08:00 |
ZhangBiao
|
c7ab8fcb8b
|
【本地化】
|
2021-03-03 18:07:29 +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 |
jiaoyangna
|
3095b8af18
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab
|
2021-03-03 16:28:47 +08:00 |
jiaoyangna
|
d429d11d29
|
图片提交
|
2021-03-03 16:26:10 +08:00 |
zhangqiang
|
59c2caaede
|
【送神祠本地化修改】
|
2021-03-03 15:51:04 +08:00 |
ZhangBiao
|
09b534b44f
|
【本地化】
|
2021-03-03 15:36:17 +08:00 |
jiaoyangna
|
ac5968285c
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-03 14:19:38 +08:00 |
jiaoyangna
|
c6f716f1ba
|
主城修改
|
2021-03-03 14:19:34 +08:00 |
zhangqiang
|
bbb7a48e07
|
福利
|
2021-03-03 14:15:18 +08:00 |
jiaoyangna
|
4e90f04c9d
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-03 12:01:21 +08:00 |
jiaoyangna
|
651f328f95
|
服务器列表 提交
|
2021-03-03 12:01:17 +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
|
ecd67f5fa5
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-02 19:58:14 +08:00 |
ZhangBiao
|
e9e18121d2
|
【本地化】逍遥游
|
2021-03-02 19:58:05 +08:00 |
jiaoyangna
|
b4da5effa6
|
白片修改提交
|
2021-03-02 18:29:15 +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
|
55e120a77b
|
竞技守卫
|
2021-03-02 18:08:27 +08:00 |
jiaoyangna
|
22b64d085d
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-02 18:05:10 +08:00 |
jiaoyangna
|
f7a06a5783
|
竞技守卫修改
|
2021-03-02 18:05:06 +08:00 |
ZhangBiao
|
eee28b7a6c
|
【本地化】
|
2021-03-02 17:45:04 +08:00 |
jiaoyangna
|
45c90098b2
|
预设提交
|
2021-03-02 17:11:00 +08:00 |
jiaoyangna
|
d81075da7a
|
还原lua
|
2021-03-02 16:53:12 +08:00 |
jiaoyangna
|
d5076fde3c
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-02 16:44:43 +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 |
ZhangBiao
|
be6b55ce43
|
【两个备份预设提交】
|
2021-03-02 16:11:15 +08:00 |
jiaoyangna
|
fcc02e4875
|
lua 提交
|
2021-03-02 15:59:29 +08:00 |
jiaoyangna
|
88e59e0c7c
|
lua 提交
|
2021-03-02 15:49:02 +08:00 |
ZhangBiao
|
b37d9625a9
|
【本地化】副本无法进入修复
|
2021-03-02 15:36:34 +08:00 |
ZhangBiao
|
f643a1d279
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-02 15:23:03 +08:00 |
ZhangBiao
|
f36126d291
|
【本地化】雷震子技能百篇
|
2021-03-02 15:22:51 +08:00 |
gaoxin
|
0ea1263a66
|
【配置】配置文件提交
|
2021-03-02 15:18:49 +08:00 |
gaoxin
|
d124d59f1b
|
【配置】完善逻辑并应用
|
2021-03-02 15:18:06 +08:00 |
zhangqiang
|
886536a4ef
|
.cs 还原
|
2021-03-02 15:14:57 +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 |
ZhangBiao
|
3681714bb0
|
【本地化】牛转钱坤
|
2021-03-02 14:45:40 +08:00 |
jiaoyangna
|
571591eb81
|
竞技场修改提交
|
2021-03-02 11:59:01 +08:00 |
jiaoyangna
|
ae9c306ee6
|
字体修改优化提交
|
2021-03-02 11:40:07 +08:00 |
ZhangBiao
|
54cfbac8fa
|
【本地化】巅峰赛白片
|
2021-03-02 10:57:07 +08:00 |
JieLing
|
39a41f45f9
|
【回滚提交】
|
2021-03-01 19:48:34 +08:00 |
ZhangBiao
|
39b6064c78
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-01 18:29:30 +08:00 |
ZhangBiao
|
fc08ad0bdf
|
【本地化】
|
2021-03-01 18:29:21 +08:00 |
zhangqiang
|
4943ca76b5
|
【报错提交】
|
2021-03-01 17:47:47 +08:00 |
ZhangBiao
|
01e39e0435
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-01 17:27:15 +08:00 |
ZhangBiao
|
dab25d828f
|
【本地化】
|
2021-03-01 17:27:06 +08:00 |
jiaoyangna
|
3b917f4c87
|
文字字体修改完善
|
2021-03-01 17:22:58 +08:00 |
jiaoyangna
|
6506a48bad
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-03-01 17:06:09 +08:00 |
jiaoyangna
|
f07c4c3952
|
字体修改提交
|
2021-03-01 17:06:03 +08:00 |
zhangqiang
|
1dd774601a
|
语法错误
|
2021-03-01 16:57:23 +08:00 |
zhangqiang
|
d7f3fc25dd
|
语法错误
|
2021-03-01 16:56:52 +08:00 |
ZhangBiao
|
aef41d8157
|
【本地化】
|
2021-03-01 16:18:34 +08:00 |
ZhangBiao
|
9b70a72ce7
|
【本地化】公会boss排名消失
|
2021-03-01 15:09:10 +08:00 |
ZhangBiao
|
84d85ca3a6
|
【本地化】装备显示错误
|
2021-03-01 14:49:33 +08:00 |
ZhangBiao
|
72f28280ee
|
【本地化】排行榜显示跳行
|
2021-03-01 11:39:07 +08:00 |
ZhangBiao
|
a3debe0e0e
|
【本地化】英文版本首次试炼必得五星显示不全
|
2021-03-01 11:34:05 +08:00 |
ZhangBiao
|
9a528217d8
|
【本地化】观音技能白片
|
2021-03-01 11:15:15 +08:00 |
gaoxin
|
6100400afa
|
【本地化】修复鸿蒙阵白片
|
2021-02-27 19:30:23 +08:00 |
gaoxin
|
fffa09cbdb
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-27 19:21:31 +08:00 |
gaoxin
|
d6613db511
|
【本地化】修复鸿蒙阵白片
|
2021-02-27 19:21:25 +08:00 |
zhangqiang
|
b281d6e5cb
|
Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
|
2021-02-27 18:14:53 +08:00 |
zhangqiang
|
aa0ccbc52c
|
【越南语】功能解锁
|
2021-02-27 18:14:39 +08:00 |
gaoxin
|
159dd3fa1d
|
【引导临时处理】关闭高级账号的引导
|
2021-02-27 18:09:58 +08:00 |
zhangqiang
|
843900d659
|
【越南语】修改
|
2021-02-27 17:59:07 +08:00 |
gaoxin
|
6faa7a29ae
|
Merge branch '0功能/周版本优化0303' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
|
2021-02-27 17:32:37 +08:00 |
gaoxin
|
1ca6517454
|
Merge commit '0bd2c53e6c38b87ace2ab14a979a56362d35fc7e' into 0功能/周版本优化0303
|
2021-02-27 17:31:09 +08:00 |
zhangqiang
|
73d50e9777
|
Merge branch '0功能/周版本优化0303' into master_xma_local
|
2021-02-27 16:55:47 +08:00 |
zhangqiang
|
656ebc2d44
|
【十绝阵】排名修改提交
|
2021-02-27 16:54:52 +08:00 |
zhangqiang
|
2ef4340998
|
代码错误
|
2021-02-27 16:52:26 +08:00 |
zhangqiang
|
ed26774755
|
【ScrollCycleView】修改6
|
2021-02-27 16:52:18 +08:00 |
wangzhenxing
|
55972b70d7
|
【战斗】==========除死亡技能外,混乱后的所有技能都变为混乱普攻
|
2021-02-27 16:52:12 +08:00 |
wangzhenxing
|
9362f341a6
|
[战斗]==============被动200修改,混乱状态下的所有攻击方式都变为混乱普攻
|
2021-02-27 16:52:06 +08:00 |
zhangqiang
|
e3bae7a821
|
提交
|
2021-02-27 16:52:00 +08:00 |
zhangqiang
|
1604821615
|
【ScrollCycleView】修改5
|
2021-02-27 16:51:55 +08:00 |
zhangqiang
|
8e9c439623
|
【越南语】修改
|
2021-02-27 16:36:05 +08:00 |
zhangqiang
|
9739ff3090
|
【越南语】修改
|
2021-02-27 16:21:23 +08:00 |
gaoxin
|
bca617284b
|
【本地化】重置选择神将界面文字超框显示修改
|
2021-02-27 15:52:11 +08:00 |
zhangqiang
|
7a7196f93a
|
【越南语】修改
|
2021-02-27 15:42:50 +08:00 |
gaoxin
|
ae39622310
|
【本地化】充值界面文字显示错乱修改
|
2021-02-27 15:22:24 +08:00 |