zhangqiang
|
5162b3247c
|
【跨服天梯】国内提交+1
|
2021-07-13 11:28:36 +08:00 |
zhangqiang
|
7c7e0970a2
|
【跨服天梯】国内提交替换资源 。。。。
|
2021-07-08 10:36:33 +08:00 |
zhangqiang
|
71540fcfd2
|
【跨服天梯】国内提交1
|
2021-06-25 15:23:55 +08:00 |
zhangqiang
|
4438ad6a72
|
【跨服天梯】国内首提
|
2021-06-15 20:08:14 +08:00 |
jiaoyangna
|
ec55dc15af
|
红点提交
|
2021-06-02 11:08:03 +08:00 |
jiaoyangna
|
259155fe52
|
【ID1016093】
【无尽副本】点亮新图鉴时,副本没红点
|
2021-06-01 16:53:08 +08:00 |
jiaoyangna
|
4724c13023
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-29 16:34:20 +08:00 |
jiaoyangna
|
6a4d713949
|
無盡添加戰力
|
2021-05-29 16:34:00 +08:00 |
ZhangBiao
|
2a552d0730
|
【踏碎凌霄】引导增加活动是否开启检测
|
2021-05-29 15:39:21 +08:00 |
jiaoyangna
|
666f77c3db
|
无尽修改提交
|
2021-05-27 17:34:59 +08:00 |
jiaoyangna
|
7baad945bf
|
无尽提交
|
2021-05-26 22:14:17 +08:00 |
jiaoyangna
|
35d0927881
|
无尽副本修改提交
|
2021-05-26 22:00:33 +08:00 |
jiaoyangna
|
618d8094ea
|
无尽副本修改提交
|
2021-05-26 17:27:47 +08:00 |
jiaoyangna
|
bb2cd6a263
|
无尽副本修改提交
|
2021-05-26 14:57:28 +08:00 |
jiaoyangna
|
c95211428b
|
Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-05-26 11:55:14 +08:00 |
jiaoyangna
|
e3c4ac2440
|
无尽副本战力修改提交
|
2021-05-26 11:52:32 +08:00 |
jiaoyangna
|
da6dd0283c
|
编队修改提交
|
2021-05-25 20:37:12 +08:00 |
jiaoyangna
|
5fb2aa23ce
|
无尽副本修改提交
|
2021-05-25 16:20:56 +08:00 |
zhangqiang
|
a1c4a6aa5c
|
【心魔】 + 山河社稷图修改
|
2021-05-25 14:51:26 +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 |
zhangqiang
|
cb86e3efd4
|
【山河社稷图】
|
2021-05-21 19:07:46 +08:00 |
jiaoyangna
|
30a6a41fe6
|
无尽副本修改提交
|
2021-05-21 16:39:08 +08:00 |
zhangqiang
|
4b2259d65a
|
【山河社稷图】加副关卡编队
|
2021-05-20 16:46:26 +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 |
zhangqiang
|
c27ddeb2a4
|
【山河社稷图】编队加职能 调副关卡恭喜获得背景层级
|
2021-05-18 15:17:05 +08:00 |
jiaoyangna
|
1bf7f53661
|
神将修改提交
|
2021-05-18 11:44:17 +08:00 |
zhangqiang
|
32eace4be7
|
【山河社稷图】一键上阵修改
|
2021-05-17 19:34:23 +08:00 |
zhangqiang
|
d1e27ccdc3
|
【山河社稷图】编队bug
|
2021-05-17 17:54:21 +08:00 |
jiaoyangna
|
00497c7071
|
无尽副本优化提交
|
2021-05-15 18:25:45 +08:00 |
zhangqiang
|
54fa0110e5
|
【山河社稷图】提交
|
2021-05-15 13:49:18 +08:00 |
jiaoyangna
|
848af2cbbe
|
下阵操作
|
2021-05-14 19:48:53 +08:00 |
jiaoyangna
|
d62b8b5011
|
无尽副本修改提交
|
2021-05-14 19:11:40 +08:00 |
zhangqiang
|
e4eda3017e
|
【山河社稷图】提交
|
2021-05-13 20:30:10 +08:00 |
zhangqiang
|
410f679e68
|
【山河社稷图】提交
|
2021-05-11 16:58:01 +08:00 |
gaoxin
|
fa61ea1317
|
【ios推荐服】白片处理,修复无尽副本无法返回,修复副本回到主界面点击其他页签黑屏
|
2021-04-22 20:39:30 +08:00 |
gaoxin
|
59577999a5
|
Revert "【内存优化】添加一些debug打印"
This reverts commit 31ad3358bc .
|
2021-04-22 18:27:29 +08:00 |
gaoxin
|
868643f87c
|
【spLoader】处理一些白片问题
|
2021-04-22 18:26:48 +08:00 |
gaoxin
|
31ad3358bc
|
【内存优化】添加一些debug打印
|
2021-04-22 09:46:59 +08:00 |
gaoxin
|
3819869e27
|
Merge branch 'china/dev' into china/ios
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleSkinPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
|
2021-04-21 17:54:16 +08:00 |
ZhangBiao
|
2df3ac159c
|
【限时活动】完成?删除loggreen
|
2021-04-21 16:36:12 +08:00 |
gaoxin
|
30b329a837
|
【ios】图片回收
|
2021-04-21 13:12:04 +08:00 |
JLIOSM1
|
c31a82ef7f
|
【ios】lua文件格式修改
|
2021-04-20 13:58:00 +08:00 |
ZhangBiao
|
034d0846c5
|
【森罗幻境】提交
|
2021-04-17 17:12:24 +08:00 |
JieLing
|
aff624a2ba
|
【森罗幻境】修改
|
2021-04-15 16:09:58 +08:00 |
ZhangBiao
|
749fd32ed0
|
【森罗幻境】选择英雄按战力发送英雄顺序
|
2021-04-15 15:28:04 +08:00 |
ZhangBiao
|
d5879c2445
|
【森罗幻境】暂时还原
|
2021-04-15 14:24:40 +08:00 |
ZhangBiao
|
5d47d0b42e
|
【森罗】排序,选择相同将,修复
|
2021-04-15 12:26:47 +08:00 |
ZhangBiao
|
fff121933f
|
【森罗幻境】选择相同神将报错修复
|
2021-04-15 09:35:24 +08:00 |
ZhangBiao
|
12a4d787c2
|
|
2021-04-14 20:11:53 +08:00 |
ZhangBiao
|
16625adb84
|
|
2021-04-14 20:06:07 +08:00 |