ZhangBiao
|
2a552d0730
|
【踏碎凌霄】引导增加活动是否开启检测
|
2021-05-29 15:39:21 +08:00 |
wangzhenxing
|
347341ca02
|
[福利]红包修改提交
|
2021-05-28 12:36:39 +08:00 |
wangzhenxing
|
675ef2efd7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
|
2021-05-28 10:47:07 +08:00 |
wangzhenxing
|
21574bebf1
|
【限时祈愿】==祈愿活动提交
|
2021-05-28 10:36:55 +08:00 |
ZhangBiao
|
458ab29053
|
【清除Log】清楚部分Log
|
2021-05-28 10:33:53 +08:00 |
gaoxin
|
bccaf6557c
|
【巅峰赛】巅峰赛赛程界面报错
|
2021-05-27 11:04:44 +08:00 |
wangzhenxing
|
b7eaf9a65a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 16:03:40 +08:00 |
wangzhenxing
|
d821836909
|
福利红包修改提交
|
2021-05-26 16:03:28 +08:00 |
zhangqiang
|
fcc00ee1d7
|
【心魔试炼】提交
|
2021-05-25 20:50:23 +08:00 |
zhangqiang
|
a1c4a6aa5c
|
【心魔】 + 山河社稷图修改
|
2021-05-25 14:51:26 +08:00 |
wangzhenxing
|
769042a739
|
master_test_gn协议提交
|
2021-05-24 14:14:11 +08:00 |
zhangqiang
|
a30616a9fc
|
【山河社稷图】修改
|
2021-05-22 15:26:30 +08:00 |
wangzhenxing
|
ead8668479
|
福利红包修改提交
|
2021-05-21 17:32:52 +08:00 |
wangzhenxing
|
db3b58ea8e
|
合并冲突提交
|
2021-05-21 15:05:09 +08:00 |
wangzhenxing
|
6ab70e6e8d
|
【功能】==========公会红包
|
2021-05-21 14:47:04 +08:00 |
jiaoyangna
|
1e247043ac
|
Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-05-27 19:42:22 +08:00 |
jiaoyangna
|
b1cf308eeb
|
无尽修改提交
|
2021-05-27 18:08:26 +08:00 |
jiaoyangna
|
666f77c3db
|
无尽修改提交
|
2021-05-27 17:34:59 +08:00 |
jiaoyangna
|
35d0927881
|
无尽副本修改提交
|
2021-05-26 22:00:33 +08:00 |
jiaoyangna
|
736293cbe9
|
头像框颜色提交
|
2021-05-26 20:53:18 +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
|
5fb2aa23ce
|
无尽副本修改提交
|
2021-05-25 16:20:56 +08:00 |
jiaoyangna
|
c68da98b84
|
Merge branch 'china/dev-c' into 0优化/无尽副本
|
2021-05-24 14:43:42 +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
|
7cc12e74a8
|
无尽修改提交
|
2021-05-22 14:08:34 +08:00 |
jiaoyangna
|
30a6a41fe6
|
无尽副本修改提交
|
2021-05-21 16:39:08 +08:00 |
zhangqiang
|
90bba41910
|
【特权加等级奖励】3
|
2021-05-20 15:47:15 +08:00 |
zhangqiang
|
80183cd5a0
|
【特权加等级奖励】1
|
2021-05-20 14:18:48 +08:00 |
gaoxin
|
989361e574
|
Merge branch 'china/ios' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
|
2021-05-19 15:15:13 +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
|
491b7b54a7
|
【化虚坛优化】化虚坛中有可合成的将时,在神将头像、页签按钮,和化虚坛入口上添加红点提示
|
2021-05-19 10:27:55 +08:00 |
jiaoyangna
|
1bf7f53661
|
神将修改提交
|
2021-05-18 11:44:17 +08:00 |
ZhangBiao
|
0fa0f251ba
|
【修行】巅峰赛名字颜色修改
|
2021-05-17 17:42:08 +08:00 |
ZhangBiao
|
8e1b42c0ac
|
【修行】名字颜色修改
|
2021-05-17 17:28:37 +08:00 |
ZhangBiao
|
d53415d80b
|
【修行】名字颜色
|
2021-05-17 15:48:41 +08:00 |
ZhangBiao
|
ffd695f3b1
|
【修行】名字提交
|
2021-05-17 15:20:20 +08:00 |
ZhangBiao
|
58e7cea17e
|
【修行】名字颜色提交
|
2021-05-17 14:34:37 +08:00 |
zhangqiang
|
e763e54799
|
Merge branch 'china/dev-c' into china_fightLevel
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-05-17 11:04:01 +08:00 |
jiaoyangna
|
00497c7071
|
无尽副本优化提交
|
2021-05-15 18:25:45 +08:00 |
zhangqiang
|
78e1a2b5a4
|
【山河社稷图】提交
|
2021-05-15 16:16:46 +08:00 |
jiaoyangna
|
d62b8b5011
|
无尽副本修改提交
|
2021-05-14 19:11:40 +08:00 |
ZhangBiao
|
87f18cb049
|
【修行】提交
|
2021-05-14 17:48:47 +08:00 |
zhangqiang
|
57e1e32e32
|
【山河社稷图】提交
|
2021-05-14 15:03:48 +08:00 |
zhangqiang
|
364ce0526b
|
【山河社稷图】提交
|
2021-05-13 22:50:34 +08:00 |
ZhangBiao
|
8df2338780
|
【修行】提交
|
2021-05-13 17:37:47 +08:00 |
zhangqiang
|
da33b98dfb
|
【山河社稷图】提交
|
2021-05-13 09:56:11 +08:00 |
ZhangBiao
|
98e4de79b2
|
【修行】提交
|
2021-05-12 20:53:34 +08:00 |
ZhangBiao
|
b6854deccd
|
【修行】协议提交
|
2021-05-12 18:47:47 +08:00 |