jiaoyangna
|
b03751a132
|
无尽副本九元露修改提交
(cherry picked from commit bbf89bbd3a )
|
2021-07-10 14:02:18 +08:00 |
jiaoyangna
|
36a4a6241f
|
无尽副本修改提交
(cherry picked from commit 2686f970d7 )
|
2021-07-09 17:11:29 +08:00 |
jiaoyangna
|
05ef24c89c
|
【ID1009632】
【优化】修改无尽副本对话ui
|
2021-07-06 19:01:27 +08:00 |
jiaoyangna
|
bc34bdce69
|
【ID1009609】
【优化】无尽副本优化
|
2021-07-06 15:19:56 +08:00 |
jiaoyangna
|
3219a1a2b8
|
【ID1009609】
【优化】无尽副本优化
|
2021-07-06 14:43:45 +08:00 |
jiaoyangna
|
f4fe155533
|
大圣修改
|
2021-06-19 17:47:35 +08:00 |
jiaoyangna
|
819278dd3d
|
【ID1016436】
【无尽副本】战斗结算界面有经验
|
2021-06-10 16:38:19 +08:00 |
jiaoyangna
|
70cc891df2
|
【ID1009443】
【无尽副本】地图描述同时根据地图ID和当前玩家所在等级段来读取,并根据不同等级段读取副本标题
|
2021-06-09 18:14:26 +08:00 |
jiaoyangna
|
ae9d3ea396
|
无尽任务特效改提交
|
2021-06-09 17:02:04 +08:00 |
jiaoyangna
|
9a61e6b709
|
【无尽副本】只有第一次完成任务会有光效,后续完成不会有
|
2021-06-09 12:04:22 +08:00 |
jiaoyangna
|
470e7c4430
|
【ID1009379】
【无尽副本】任务完成后右侧按钮添加光效,与关卡界面相同
|
2021-06-08 18:07:22 +08:00 |
jiaoyangna
|
2f9b8de4db
|
无尽编队修改提交
|
2021-06-02 20:59:02 +08:00 |
gaoxin
|
b7c8ed1ee1
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-02 19:49:20 +08:00 |
gaoxin
|
6f6df7f5d6
|
【称号】在地图中删除称号上的canvas
|
2021-06-02 19:49:14 +08:00 |
jiaoyangna
|
2f2436697c
|
无尽关闭帮助界面
|
2021-06-02 18:22:45 +08:00 |
jiaoyangna
|
32750ffa34
|
【无尽副本】未激活五星神将或未选择五星神将不允许进入地图
|
2021-06-01 17:10:07 +08:00 |
jiaoyangna
|
259155fe52
|
【ID1016093】
【无尽副本】点亮新图鉴时,副本没红点
|
2021-06-01 16:53:08 +08:00 |
jiaoyangna
|
4a204eaba2
|
【无尽副本】在秘宝界面,刷新无尽副本,秘宝界面不关闭
|
2021-05-31 14:22:40 +08:00 |
gaoxin
|
1e36398a50
|
【内存优化】Util.Loadsprite 替换为 spLoader
|
2021-05-28 14:41:58 +08:00 |
jiaoyangna
|
8e1d427e2a
|
属性修改提交
|
2021-05-28 11:43:14 +08:00 |
jiaoyangna
|
81761b26af
|
无尽修改提交
|
2021-05-28 11:29:27 +08:00 |
jiaoyangna
|
a996bbc219
|
无尽修改提交
|
2021-05-27 22:34:11 +08:00 |
jiaoyangna
|
b1cf308eeb
|
无尽修改提交
|
2021-05-27 18:08:26 +08:00 |
jiaoyangna
|
666f77c3db
|
无尽修改提交
|
2021-05-27 17:34:59 +08:00 |
jiaoyangna
|
5dc0ea68ab
|
无尽副本提交
|
2021-05-27 15:35:10 +08:00 |
jiaoyangna
|
a9b52e6834
|
无尽副本修改提交
|
2021-05-27 15:16:46 +08:00 |
jiaoyangna
|
da6437e2a2
|
无尽提交
|
2021-05-27 10:46:22 +08:00 |
jiaoyangna
|
35d0927881
|
无尽副本修改提交
|
2021-05-26 22:00:33 +08:00 |
jiaoyangna
|
736293cbe9
|
头像框颜色提交
|
2021-05-26 20:53:18 +08:00 |
jiaoyangna
|
107d20677a
|
无尽副本提交
|
2021-05-26 20:27:39 +08:00 |
jiaoyangna
|
8f6fce191b
|
无尽任务提交
|
2021-05-26 18:07:09 +08:00 |
jiaoyangna
|
618d8094ea
|
无尽副本修改提交
|
2021-05-26 17:27:47 +08:00 |
jiaoyangna
|
bb2cd6a263
|
无尽副本修改提交
|
2021-05-26 14:57:28 +08:00 |
jiaoyangna
|
e3c4ac2440
|
无尽副本战力修改提交
|
2021-05-26 11:52:32 +08:00 |
jiaoyangna
|
06f4a3be80
|
无尽副本界面修改
|
2021-05-26 10:29:34 +08:00 |
jiaoyangna
|
5ae6e53b49
|
士气等级提升图片提交
|
2021-05-26 09:59:28 +08:00 |
jiaoyangna
|
911f443e40
|
添加属性提升
|
2021-05-26 09:51:41 +08:00 |
jiaoyangna
|
3846170f2d
|
属性提升界面修改提交
|
2021-05-25 21:40:41 +08:00 |
jiaoyangna
|
82787b2331
|
无尽编队修改
|
2021-05-25 21:27:38 +08:00 |
jiaoyangna
|
da6dd0283c
|
编队修改提交
|
2021-05-25 20:37:12 +08:00 |
jiaoyangna
|
a112127db0
|
无尽副本修改提交
|
2021-05-25 18:07:53 +08:00 |
jiaoyangna
|
5fb2aa23ce
|
无尽副本修改提交
|
2021-05-25 16:20:56 +08:00 |
jiaoyangna
|
c22e26a5f5
|
Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
# Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
# 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/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
|
2021-05-24 13:53:28 +08:00 |
jiaoyangna
|
a10ec722e5
|
无尽副本提交
|
2021-05-24 11:51:11 +08:00 |
jiaoyangna
|
7cc12e74a8
|
无尽修改提交
|
2021-05-22 14:08:34 +08:00 |
jiaoyangna
|
30a6a41fe6
|
无尽副本修改提交
|
2021-05-21 16:39:08 +08:00 |
gaoxin
|
6d551869be
|
【内存优化】新内存内存优化修改
|
2021-05-19 15:06:02 +08:00 |
gaoxin
|
1b873eb38d
|
Merge branch 'china/dev-c' into china/ios
# Conflicts:
# Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
# Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
# Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
# Assets/ManagedResources/ArtFont_en/sl_en.png.meta
# Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
# Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
# Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
# Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
# Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
# Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
# Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.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/DynamicActivity/YiJingBaoKu.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
|
2021-05-19 14:12:37 +08:00 |
ZhangBiao
|
03a19bdd14
|
【森罗无尽】没有小人修复
|
2021-04-23 16:19:44 +08:00 |
ZhangBiao
|
c2e97f144d
|
【森罗无尽】小人消失i修改
|
2021-04-23 16:04:28 +08:00 |