Commit Graph

464 Commits (89f8af19c4fa36c0640a24664f45aac9d7520ba9)

Author SHA1 Message Date
ZhangBiao fe16795d8c 【主城】右上伸缩条闪烁修改 2021-06-21 16:57:22 +08:00
jiaoyangna e562176180 超凡入圣提交 2021-06-18 18:24:04 +08:00
jiaoyangna bc20fa57fc 惊喜礼包推送修改提交 2021-06-17 15:05:44 +08:00
ZhangBiao 0b4c5f3c8f 【惊喜礼盒】提交 2021-06-16 19:56:10 +08:00
gaoxin a4fa7cacff Revert "【山河试炼】差红点的检测"
This reverts commit 160a3e1a6f.
2021-06-16 10:08:41 +08:00
gaoxin 67e44741f6 Revert "【山河试炼】增加主城红点检测"
This reverts commit e0e8974850.
2021-06-16 10:08:34 +08:00
ZhangBiao e0e8974850 【山河试炼】增加主城红点检测 2021-06-15 20:39:05 +08:00
ZhangBiao 160a3e1a6f 【山河试炼】差红点的检测 2021-06-15 20:33:22 +08:00
zhangqiang 4438ad6a72 【跨服天梯】国内首提 2021-06-15 20:08:14 +08:00
jiaoyangna f45fa022ea 玲珑宝镜修改提交 2021-06-15 11:41:37 +08:00
gaoxin 07a35aec13 【幸运探宝】按钮位置修改 2021-06-09 20:20:16 +08:00
zhangqiang 04fba6a182 【页签优化】游戏内分页签高度距离统一化 2021-06-09 12:32:30 +08:00
ZhangBiao 6c31fa860d 【右上角活动】红点修改 2021-06-07 13:32:01 +08:00
ZhangBiao a96a61ec77 【逐胜之巅】入口调整至左侧 2021-06-07 11:18:37 +08:00
ZhangBiao d744c010bf 【主城】红点 2021-06-05 11:14:36 +08:00
gaoxin 079afb4e8d Revert "【Debug】红点不消失问题debug日志添加"
This reverts commit d20e47535e.
2021-06-03 22:37:30 +08:00
gaoxin d20e47535e 【Debug】红点不消失问题debug日志添加 2021-06-03 19:50:02 +08:00
ZhangBiao 592fad463d 【玉皇大帝】入口顯示 2021-06-02 15:12:44 +08:00
ZhangBiao a6c7de8151 【主界面】成长礼包入口提交 2021-06-02 14:56:09 +08:00
ZhangBiao 0798248214 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 14:50:26 +08:00
ZhangBiao e1145deced 【玉皇大帝入口】如果购买完成长礼包,就不显示 2021-06-02 14:50:18 +08:00
gaoxin 4eea852340 【称号】修复主界面称号偶现没有特效的问题,聊天界面称号逻辑修改 2021-06-02 14:34:51 +08:00
ZhangBiao 7679f85af3 【修行】图标调整 2021-06-02 11:08:24 +08:00
gaoxin 39bb3d5c06 【称号】修改称号节点为通用节点 2021-06-01 21:13:03 +08:00
gaoxin 58faec4feb 【红点】主界面鸿蒙阵红点没有清除 2021-06-01 15:44:18 +08:00
jiaoyangna 8f31b07d52 主城百宝时间修改提交 2021-06-01 14:54:46 +08:00
ZhangBiao bfd8bee59e 【青龙秘宝】刷新不及时修改 2021-05-31 20:09:19 +08:00
ZhangBiao 19bce27f34 【修行】提交3 2021-05-29 19:58:52 +08:00
ZhangBiao 717b0039cb 【修行】印记提交2 2021-05-29 19:49:25 +08:00
ZhangBiao 1d4842a7d6 【修行】印记提交 2021-05-29 19:32:47 +08:00
ZhangBiao 749184a59a 【修行】提交 2021-05-29 19:22:35 +08:00
ZhangBiao 4cfff84328 【修行】印记提交 2021-05-29 19:14:24 +08:00
ZhangBiao 5aeb2f0ed3 【修行】名字左侧印记提交 2021-05-29 18:06:15 +08:00
zhangqiang 78ece97bfd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:54:30 +08:00
zhangqiang 1dc1ad1db1 【幸运探宝】加标签 2021-05-28 15:54:20 +08:00
ZhangBiao 3c67b0b8f3 【主城】icon问题调整 2021-05-28 15:35:02 +08:00
gaoxin 58aa9bce25 【嘿嘿】有个报错 2021-05-27 18:30:45 +08:00
gaoxin 9f8858b4f7 【主界面】左上角按钮自动排列 2021-05-27 18:20:32 +08:00
gaoxin ba4debba7b 【主界面】左上角按钮自动排列 2021-05-27 18:13:03 +08:00
gaoxin 538c8d984e 【主界面】优化提示框层级问题 2021-05-27 10:47:04 +08:00
ZhangBiao bc2c2eb916 【主城】主城小人,看不见自己, 2021-05-26 21:05:06 +08:00
ZhangBiao f186f29646 提交 2021-05-26 14:44:22 +08:00
ZhangBiao b526f58bc3 【主界面】右上角调整 2021-05-26 13:48:33 +08:00
ZhangBiao 5155b4aeb3 【主界面】提交 2021-05-26 11:53:45 +08:00
ZhangBiao d7cda43ed0 【主界面】右上伸缩条调整 2021-05-26 11:16:27 +08:00
ZhangBiao f3cf294f42 【主界面】右上伸缩条首充引导调整,修行调整 2021-05-26 10:16:24 +08:00
ZhangBiao 9e6dc29cb9 【主界面】右上伸缩条红点 2021-05-25 21:08:48 +08:00
ZhangBiao d835687e8c 【主城】伸缩条调整 2021-05-25 18:33:26 +08:00
ZhangBiao d41ba9f65d 【主城】右侧伸缩条 2021-05-25 18:21:52 +08:00
ZhangBiao cecea9b415 【修行】主界面 修行提交 1 2021-05-25 10:16:07 +08:00
gaoxin e308fd0149 【主界面】修复update方法不能停止的问题 2021-05-24 16:24:16 +08:00
wangzhenxing 769042a739 master_test_gn协议提交 2021-05-24 14:14:11 +08:00
jiaoyangna 8719603f64 牛气冲天,福星高照修改 2021-05-22 15:20:51 +08:00
wangzhenxing 9b336aeda9 主城报错修改提交 2021-05-21 18:13:21 +08:00
wangzhenxing cade21c700 主城报错修改提交 2021-05-21 18:00:25 +08:00
zhangqiang d2a53631d6 【山河社稷图】提交 2021-05-21 16:21:07 +08:00
zhangqiang da17fb96ed 【主城修改】2 2021-05-20 20:32:04 +08:00
zhangqiang 97ba718ac2 Merge branch 'china/dev-c' into china/mainSceneChange
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-05-20 17:32:06 +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 ec8c7ea645 成长礼包添加特效 2021-05-13 11:30:39 +08:00
jiaoyangna c4cf95921f 【活动优化】成长礼包banner替换及跳转增加流光特效 2021-05-13 10:50:38 +08:00
jiaoyangna c66b323044 【活动优化】成长礼包banner替换及跳转增加流光特效 2021-05-12 21:05:36 +08:00
jiaoyangna 214c971c41 Merge branch '0活动开发聚集地/new主题活动' into china/dev-c 2021-05-12 11:21:28 +08:00
jiaoyangna 4c41ca0572 音效提交
(cherry picked from commit 5a19a26d943af8465f22614548083da158ee8c85)
2021-05-12 11:07:44 +08:00
jiaoyangna 847adfc761 主题活动提交 2021-05-10 20:20:20 +08:00
jiaoyangna 3fffdd9cd3 活动主界面修改提交 2021-05-10 10:52:44 +08:00
jiaoyangna f88ccd8f68 [主题活动修改提交] 2021-05-10 10:06:53 +08:00
zhangqiang 601f5c09b9 【拍脸】修改 2021-05-06 18:08:53 +08:00
jiaoyangna 3578f57882 关闭假战斗回放 2021-04-29 20:16:37 +08:00
jiaoyangna 1da013efda 剧情提交 2021-04-29 15:35:18 +08:00
jiaoyangna 660299a6d2 六星玉帝入口跳转特定礼包修改提交 2021-04-29 10:08:28 +08:00
DESKTOP-98AVA47\Administrator da44c05e9f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-07-14 01:46:26 +07:00
DESKTOP-98AVA47\Administrator d9d1e50e9c 【超值基金】去掉月卡激活判断 2021-07-14 01:45:47 +07:00
wangzhenxing 4e61e39e53 主城 六星玉帝入口,16日登陆入口适配 2021-04-28 02:52:56 +08:00
wangzhenxing 54601fb463 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-28 00:33:07 +08:00
wangzhenxing e918945386 主城六星玉帝入口进入成长礼包滑动到指定条目 2021-04-28 00:32:55 +08:00
jiaoyangna f352c53b6f 关闭主城临时剧情入口 2021-04-28 00:16:08 +08:00
zhangqiang 6775377060 【主城超值基金隐藏倒计时】 2021-04-27 23:25:39 +08:00
jiaoyangna 58e6a0a554 剧情提交
(cherry picked from commit f43cd38a73)
2021-04-27 22:21:46 +08:00
gaoxin 357a27c100 Merge remote-tracking branch 'origin/剧情' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta
#	Assets/ManagedResources/Atlas/Story/wzs.jpg.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta
#	Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
2021-04-26 19:03:05 +08:00
jiaoyangna 637aa36041 剧情提交 2021-04-26 18:29:47 +08:00
gaoxin 7df1514da8 Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
2021-04-26 17:55:43 +08:00
ZhangBiao 2770e6da31 Merge branch 'china/dev-c' into 0活动开发聚集地/踏碎凌霄
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-04-26 17:18:02 +08:00
wangzhenxing 62112ecff0 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-26 15:45:43 +08:00
wangzhenxing ebde6e43b0 [功能]========【ID1008784】 【活动优化】增加成长礼包入口跳转功能 2021-04-26 15:45:30 +08:00
zhangqiang 154e048796 【十五日登陆】无可领取奖励时,入口消失 2021-04-26 15:19:11 +08:00
zhangqiang b4ed183fc6 【前端拍脸修改】提交——1 2021-04-26 13:44:31 +08:00
zhangqiang 2b595bb8f5 【跳转】化虚坛跳转修改2 2021-04-25 14:20:07 +08:00
ZhangBiao bd236f0f32 【踏碎凌霄】 2021-04-23 14:12:24 +08:00
jiaoyangna a8393f2fb1 Merge branch 'china/dev-c' into 剧情
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-04-22 15:09:00 +08:00
jiaoyangna a0ecd56968 剧情提交 2021-04-22 15:06:47 +08:00
gaoxin 43afe3d6f1 【内存】btview可能会导致重复卸载资源的问题 2021-04-22 13:40:04 +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 2a6f81e8cf 【ios】spLoader产生bug修复 2021-04-21 15:09:03 +08:00
ZhangBiao eab420381c Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-04-21 15:02:04 +08:00
gaoxin 30b329a837 【ios】图片回收 2021-04-21 13:12:04 +08:00
wangzhenxing eff7ceb60c 【ID1008821】
【主界面优化】当右侧未显示区域入口按钮有红点提示时,主界面闪烁显示向右的箭头
2021-04-21 10:50:18 +08:00
JLIOSM1 c31a82ef7f 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
zhangqiang 1e688ab350 超值基金提交 2021-04-19 20:43:15 +08:00
zhangqiang d7913e5eab 超值基金,限时折扣,点击没反应修改 2021-04-19 20:42:11 +08:00
ZhangBiao e08a50f30c 【云游商人】 2021-04-17 14:01:12 +08:00
ZhangBiao 762aef88e0 【云游商人】提交 2021-04-16 14:58:40 +08:00
ZhangBiao c8cd41670b 【至尊豪礼】提交 2021-04-14 17:20:55 +08:00
ZhangBiao 2214d15550 【福星高照】拍脸增加主线引导冲突限制 2021-04-13 17:12:28 +08:00
ZhangBiao 6e87c6b41c 【十五日登录】奖励领完不关闭修复 2021-04-13 14:06:42 +08:00
ZhangBiao 090b0c8f70 【十五日登录】提交 2021-04-12 19:29:05 +08:00
ZhangBiao 73b3a2e268 【十五日登录】活动刷新延迟容错 2021-04-12 18:20:08 +08:00
gaoxin 839a9e4d1d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-12 17:03:11 +08:00
wangzhenxing 443ba942cf [功能]================称号功能提交 2021-04-12 16:23:57 +08:00
ZhangBiao e986b8d956 【十五日】
(cherry picked from commit 0e41801daf)
2021-04-12 15:06:57 +08:00
ZhangBiao 276e0129fe 【十五日登陆】修改提交
(cherry picked from commit 8e0177d3ed)
2021-04-12 15:06:43 +08:00
ZhangBiao 0e41801daf 【十五日】 2021-04-12 15:04:33 +08:00
ZhangBiao 8e0177d3ed 【十五日登陆】修改提交 2021-04-12 15:02:49 +08:00
JieLing 52a2ecabd6 【活动开启】提审服关闭日周月礼包 2021-04-12 10:46:32 +08:00
jiaoyangna 071a91773a 导出 文本提交 2021-04-09 12:26:35 +08:00
jiaoyangna 8291a48e73 Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
#	Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
#	Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
#	Assets/ManagedResources/Icon/ChengHao.meta
#	Assets/ManagedResources/Icon/ZuoQi.meta
#	Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
#	Assets/ManagedResources/~Lua/Logic/Network.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
#	Assets/ManagedResources/~Lua/View/FetterItem.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-04-09 12:24:01 +08:00
jiaoyangna 0ab7c3177a 还原文字提交 2021-04-09 12:06:17 +08:00
jiaoyangna 38e64fb774 还原文字提交 2021-04-09 11:39:09 +08:00
jiaoyangna fa4cdf0f2d 主城添加判断等级判断 2021-04-08 20:55:49 +08:00
jiaoyangna e14b9d4343 主城修改 提交 2021-04-08 20:52:59 +08:00
ZhangBiao d423390397 【十五日登录】特效+无尽副本编队问题 2021-04-07 20:27:56 +08:00
gaoxin 9033d47109 【本地化】文本导出 2021-04-06 22:33:57 +08:00
gaoxin d6319948f2 【金钱显示兼容】添加金钱显示组件,对积天豪礼,成长礼包,首充界面进行兼容性处理。 2021-04-06 22:30:21 +08:00
zhangqiang 5d0882d9ff 【主场景修改】——01 2021-04-06 17:48:35 +08:00
ZhangBiao 63bcee6168 Merge branch '0活动开发聚集地/十五日登录' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-04-06 15:51:24 +08:00
gaoxin cf5a2a46fa 【本地化】还原文本到代码种 2021-04-06 15:23:27 +08:00
jiaoyangna fd08211e30 主题活动图标修改 2021-04-06 13:52:27 +08:00
jiaoyangna f1a8a740c7 【ID1008091】
【活动优化】超值基金购买后,主城超值基金入口倒计时消失
2021-04-06 11:52:44 +08:00
ZhangBiao 4c0150b7d9 【十五日登陆】导入特效资源 2021-04-02 16:04:57 +08:00
ZhangBiao d69d96a321 【十五日登陆】红点 2021-04-02 11:53:07 +08:00
gaoxin cbb28ebeae 【本地化】文本导出 2021-04-01 18:36:34 +08:00
gaoxin 8c2a1c9a5b 【引导】引导GM添加 2021-03-31 20:03:21 +08:00
ZhangBiao d970a91c95 【三界除魔】入口消失修复
(cherry picked from commit 31f1354b19)
2021-03-31 17:01:50 +08:00
ZhangBiao 31f1354b19 【三界除魔】入口消失修复 2021-03-31 16:59:56 +08:00
ZhangBiao 38e4f42b7e 【十五日登陆】 2021-03-31 15:52:11 +08:00
ZhangBiao afcfa71db7 【福星高照】不关闭修复 2021-03-30 22:42:17 +08:00
jiaoyangna ad24255948 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 21:02:36 +08:00
gaoxin 6e34c88fa5 【人物信息栏】修复战力刷新不及时的问题 2021-03-30 20:46:47 +08:00
jiaoyangna 0494e55215 Merge branch '0活动开发聚集地/活动拆分归类' into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
2021-03-30 20:41:32 +08:00
ZhangBiao 98a49ad693 Merge branch 'china/dev' into 0活动开发聚集地/福星高照 2021-03-30 20:28:12 +08:00
gaoxin c88cd5b7e1 【主界面】扩大场景的显示范围 2021-03-30 20:22:57 +08:00
jiaoyangna 23b46ba218 活动 修改提交 2021-03-30 20:17:26 +08:00
ZhangBiao d61c55d24d Merge branch 'china/dev' into 0活动开发聚集地/福星高照
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-03-30 18:55:35 +08:00
gaoxin 8161aca202 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 18:42:38 +08:00
gaoxin 3cc0b51edd 【特权优化】将界面顶部的特权等级移回-神将、背包界面修改,修复战斗和vip等级不及时刷新的问题 2021-03-30 18:42:30 +08:00
jiaoyangna d860db875d Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-30 18:19:12 +08:00
jiaoyangna 7d9a5a62ba 天书秘卷 提交 2021-03-30 18:18:16 +08:00