Commit Graph

123 Commits (debd1f0a63297f3e9c25c9d0ff5980843fb3895a)

Author SHA1 Message Date
gaoxin fe517d91ed 【红点】还原清空所有红点的操作 2021-06-04 23:56:09 +08:00
ZhangBiao 39180183a9 【任务头像】红点问题修改 2021-06-04 18:41:32 +08:00
gaoxin 4077e33390 【红点】箭头红点不消失修复 2021-06-03 19:30:57 +08:00
ZhangBiao 07a877bd4c 【牛气冲天】红点修改 2021-06-03 18:19:12 +08:00
ZhangBiao d19325ce7b 【公会红点】报错修改 2021-06-03 17:59:14 +08:00
wangzhenxing 2cde942f47 [限时祈愿]=====红点逻辑修改 2021-06-03 12:04:04 +08:00
DESKTOP-98AVA47\Administrator 1f75672cb8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-26 18:15:45 +08:00
zhangqiang f265cb07ef 【山河社稷图】红点帮错 公会技能属性名称修改 2021-06-02 17:39:11 +08:00
zhangqiang fb8410eaa5 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 19:48:05 +08:00
zhangqiang 859bd6679e 点将台10连加入红点提示 2021-06-01 19:47:54 +08:00
jiaoyangna a1ac495ca2 红点提交 2021-06-01 17:22:23 +08:00
jiaoyangna 259155fe52 【ID1016093】
【无尽副本】点亮新图鉴时,副本没红点
2021-06-01 16:53:08 +08:00
wangzhenxing 10f97f9b8b [许愿神将]===活动修改 2021-05-31 11:31:15 +08:00
jiaoyangna 4b33fee287 红点修改提交 2021-05-28 10:20:13 +08:00
jiaoyangna 89c667d314 无尽红点修改提交 2021-05-28 09:55:48 +08:00
ZhangBiao b0226b664f Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-27 19:55:10 +08:00
ZhangBiao 13b222d998 【每日豪礼】可领取,没红点 2021-05-27 19:54:54 +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
DESKTOP-98AVA47\Administrator 0ad3913381 红点修改提交 2021-05-26 18:15:37 +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
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
zhangqiang da9aeed441 【心魔试炼】提交 2021-05-26 11:48:44 +08:00
ZhangBiao 9e6dc29cb9 【主界面】右上伸缩条红点 2021-05-25 21:08:48 +08:00
ZhangBiao cecea9b415 【修行】主界面 修行提交 1 2021-05-25 10:16:07 +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
ZhangBiao 70729ca2d0 【修行】增加红点 2021-05-24 11:21:56 +08:00
jiaoyangna 30a6a41fe6 无尽副本修改提交 2021-05-21 16:39:08 +08:00
wangzhenxing db3b58ea8e 合并冲突提交 2021-05-21 15:05:09 +08:00
wangzhenxing 6ab70e6e8d 【功能】==========公会红包 2021-05-21 14:47:04 +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
zhangqiang e4eda3017e 【山河社稷图】提交 2021-05-13 20:30:10 +08:00
gaoxin d413915c6a 【竞技场】修复竞技场赛季切换时也会显示红点儿的问题 2021-04-29 17:12:12 +08:00
gaoxin 2a107e99cb 【红点】关闭一些重复注册的红点 2021-04-27 16:30:08 +08:00
ZhangBiao 8117c5ebba 【云游商人】怎加红点 2021-04-22 10:59:32 +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
zhangqiang bf895d04d1 【百宝斋】杂货商店和魂印商店免费次数到达上限的红点加回来 2021-04-21 17:49:58 +08:00
wangzhenxing 8e24eea290 称号bug修改 2021-04-21 14:42:06 +08:00
JLIOSM1 c31a82ef7f 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
ZhangBiao de85b844e5 【逐圣商店】取消主胜商店红点 2021-04-14 17:41:44 +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
gaoxin 196dfa34dd 【GM】添加红点数据查看工具 2021-04-09 16:14:24 +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
ZhangBiao bfaa5195b5 Revert "【表删除】报错处理"
This reverts commit b163fc3035.
2021-04-07 11:54:39 +08:00
ZhangBiao 58d20c0bd3 【限时活动】没东西有红点 2021-04-07 11:05:26 +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 b163fc3035 【表删除】报错处理 2021-04-06 15:16:37 +08:00