Commit Graph

449 Commits (e9f9010c12e60a0738ce57d738c8f43c0b1d5a86)

Author SHA1 Message Date
zhangqiang 9c28f232f6 【跨服排行榜】 2021-07-29 16:35:58 +08:00
zhangqiang 9a2d9c70a7 【新功能】罗浮争锋排行榜增加跨服切磋功能 2021-07-28 15:48:35 +08:00
ZhangBiao ffd0685d97 【任务跳转】未解锁灵兽山,灵兽招募任务前往提示活动未开启,应提示功能未解锁
【红点】车迟斗法的红点仍绑在副本入口处,而非公会按钮
2021-07-28 11:20:27 +08:00
zhangqiang 71f7e8a469 Merge branch 'china/dev' into china/jumpserver
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-07-27 11:26:30 +08:00
DESKTOP-98AVA47\Administrator 022681face 红点修改提交 2021-07-23 11:36:44 +08:00
zhangqiang 1cf142c82b 【跨服天梯】国内提交+1 2021-07-22 19:01:46 +08:00
zhangqiang b395410ac1 Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-20 18:09:07 +08:00
jiaoyangna acbdf46600 跳转 修改提交 2021-07-20 13:46:13 +08:00
DESKTOP-98AVA47\Administrator 8168d284f0 跳转提交 2021-07-20 10:20:41 +08:00
DESKTOP-98AVA47\Administrator 2f9a357023 跳转修改提交 2021-07-19 21:58:45 +08:00
jiaoyangna 61a2da78cd 超值基金跳转 2021-07-19 11:48:41 +08:00
DESKTOP-98AVA47\Administrator 36f04065fc Merge branch 'china/dev' into 0优化/主题活动
# Conflicts:
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-07-15 12:59:20 +08:00
zhangqiang 6a3c48e0b8 【跨服天梯】国内提交+1 2021-07-14 21:43:03 +08:00
ZhangBiao bc55cf3a19 Merge branch 'china/dev' into 0功能/山河试炼
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-07-14 18:08:46 +08:00
jiaoyangna a8fd256812 ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化

(cherry picked from commit 53e0f1adcc)
2021-07-14 16:59:59 +08:00
jiaoyangna 047c5c26f7 globaldefine冲突修改 2021-07-14 16:59:03 +08:00
jiaoyangna 53e0f1adcc ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
2021-07-14 12:04:37 +08:00
ZhangBiao c8b8a84d47 【山河试炼】差红点检测 2021-07-14 11:36:33 +08:00
jiaoyangna 9f4d456004 【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
2021-07-13 17:25:21 +08:00
jiaoyangna 1ead3c126d 抽卡红点提交 2021-07-10 14:56:28 +08:00
jiaoyangna 13905916d1 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 16:48:59 +08:00
zhangqiang fbda34d678 Merge branch 'china/dev' into china/dev_缥缈之旅
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
2021-07-03 16:53:42 +08:00
jiaoyangna 19247e296e 神将来源跳转修改提交 2021-07-02 11:23:07 +08:00
zhangqiang a2528a3ded 【去掉无用打印】 2021-07-01 21:07:53 +08:00
zhangqiang 1be2dc60eb 【缥缈之旅】提交1 2021-07-01 20:13:47 +08:00
ZhangBiao 70b42de2ac Merge branch 'china/dev' into 0活动开发聚集地/特惠神装 2021-07-01 20:09:56 +08:00
jiaoyangna 4f34d6ed42 神将来源返回时打开 2021-07-01 18:12:20 +08:00
ZhangBiao 53567ea586 【Log】清除带颜色的Log 2021-07-01 16:33:40 +08:00
zhangqiang deb6eeca03 【跳转】增加惊喜礼盒跳转 2021-07-01 15:01:57 +08:00
jiaoyangna a4281ed031 四元阵跳转修改 2021-06-30 16:07:37 +08:00
jiaoyangna 37b7071ccf 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-29 20:05:15 +08:00
jiaoyangna 1c89a4218c 假人骑牛修改 2021-06-23 11:05:53 +08:00
jiaoyangna e5a491b7b9 随机人物修改提交 2021-06-23 10:20:03 +08:00
jiaoyangna 15361c2ef5 大圣跳转 2021-06-19 17:07:17 +08:00
jiaoyangna e562176180 超凡入圣提交 2021-06-18 18:24:04 +08:00
gaoxin a4fa7cacff Revert "【山河试炼】差红点的检测"
This reverts commit 160a3e1a6f.
2021-06-16 10:08:41 +08:00
ZhangBiao 160a3e1a6f 【山河试炼】差红点的检测 2021-06-15 20:33:22 +08:00
zhangqiang 4438ad6a72 【跨服天梯】国内首提 2021-06-15 20:08:14 +08:00
jiaoyangna ed4472a298 挂机卡死修改提交 2021-06-11 10:48:11 +08:00
jiaoyangna 2419089ff4 【ID1016454】
【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示
2021-06-11 10:30:57 +08:00
jiaoyangna 11bb03fd2b 【ID1016454】
【使用跳转】寻仙玉在活动未开启时,点击使用按钮,没有合理提示
2021-06-11 10:18:38 +08:00
zhangqiang 04fba6a182 【页签优化】游戏内分页签高度距离统一化 2021-06-09 12:32:30 +08:00
jiaoyangna bf5c4197ce 【ID1009418】
【无尽副本】购买行动力任务,点击前往按钮关闭弹窗并打开购买行动力界面
2021-06-09 11:03:18 +08:00
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 c4c0cb5a69 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-01 16:53:25 +08:00
jiaoyangna 259155fe52 【ID1016093】
【无尽副本】点亮新图鉴时,副本没红点
2021-06-01 16:53:08 +08:00
ZhangBiao 2a4927477c 【主题活动】跳转问题 2021-06-01 14:58:57 +08:00
ZhangBiao 9ebd4c5e05 【心愿抽卡】游戏里道具寻仙玉跳转不是限时商市,跳主题活动主页面 2021-05-31 18:00:42 +08:00
wangzhenxing 10f97f9b8b [许愿神将]===活动修改 2021-05-31 11:31:15 +08:00
ZhangBiao 1d4842a7d6 【修行】印记提交 2021-05-29 19:32:47 +08:00
ZhangBiao 5aeb2f0ed3 【修行】名字左侧印记提交 2021-05-29 18:06:15 +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 6adde33bf8 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 10:34:00 +08:00
ZhangBiao 458ab29053 【清除Log】清楚部分Log 2021-05-28 10:33:53 +08:00
jiaoyangna 4b33fee287 红点修改提交 2021-05-28 10:20:13 +08:00
jiaoyangna 89c667d314 无尽红点修改提交 2021-05-28 09:55:48 +08:00
jiaoyangna a996bbc219 无尽修改提交 2021-05-27 22:34:11 +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
jiaoyangna 7779c1dbb1 无尽副本修改提交 2021-05-27 15:04:21 +08:00
zhangqiang ac0feb82be 【bug】 2021-05-27 11:07:32 +08:00
zhangqiang f758982d32 【山河社稷图】跳转 2021-05-27 09:50:11 +08:00
jiaoyangna 35d0927881 无尽副本修改提交 2021-05-26 22:00:33 +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
jiaoyangna 5fb2aa23ce 无尽副本修改提交 2021-05-25 16:20:56 +08:00
zhangqiang dfa198081a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 14:51:58 +08:00
zhangqiang a1c4a6aa5c 【心魔】 + 山河社稷图修改 2021-05-25 14:51:26 +08:00
ZhangBiao cecea9b415 【修行】主界面 修行提交 1 2021-05-25 10:16:07 +08:00
jiaoyangna 33834cc9b2 Merge branch 'china/dev-c' into 0功能/silingshilian
# Conflicts:
#	Assets/ManagedResources/Atlas/FourElement.meta
#	Assets/ManagedResources/Atlas/FourElement/ArtFont/s_silingshilian_yitongguan_zh.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_daodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_di.jpg.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_fodi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_rendi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_renjieshiliandi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shilianjianglidi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shoudi.png.meta
#	Assets/ManagedResources/Atlas/FourElement/s_silingshilian_yaodi.png.meta
#	Assets/ManagedResources/LuaBytes.meta
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/Managers.lua
#	Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua.meta
#	Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua.meta
#	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/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
2021-05-24 16:39:34 +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 aecc6eb692 【特权优化】特权任务在关卡界面增加快捷入口 2021-05-20 21:00:29 +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 deeaa0221d 每日礼包界面内,点击妖晶快捷获取按钮,再点击商店,商店内点击妖晶快捷获取,退出时会重复显示界面的bug; 2021-05-18 21:04:58 +08:00
jiaoyangna 83697a9de4 Merge branch 'china/dev' into china/dev-c 2021-05-18 20:53:23 +08:00
gaoxin 2b693b417e 【跳转】活动跳转添加开启判断 2021-05-18 15:50:17 +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 9662b5f236 Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/ArtFont_vi/x_xianshishangshi_banner_png_vi.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_1801_zh.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/r_mrcz_18_zh.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity3/shenjiang33_change.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/TagAtlas/ArtFont/r_shangdian_xingchen_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_03_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_04_zh.png.meta
#	Assets/ManagedResources/DynamicAtlas/ArtFont/c_czlb_banner_solgan_zh.png.meta
#	Assets/ManagedResources/Icon/Item/r_Material_scfx_0001.png.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page3.prefab
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua
2021-05-15 16:37:00 +08:00
jiaoyangna bc1a22a1f9 跳转提交 2021-05-13 20:59:29 +08:00
zhangqiang e4eda3017e 【山河社稷图】提交 2021-05-13 20:30:10 +08:00
jiaoyangna 5817146b6f 主题活动修改提交
(cherry picked from commit 0b5177748b)
2021-05-12 17:41:19 +08:00
jiaoyangna 06fb7e218f 主题活动提交
(cherry picked from commit 847adfc761)
2021-05-12 17:39:46 +08:00
jiaoyangna 3c04e8dbe1 [主题活动修改提交]
(cherry picked from commit f88ccd8f68)
2021-05-12 17:37:59 +08:00
jiaoyangna dc66043a06 【活动优化】百宝商会增加一键购买,礼包金额及奖励变更 2021-05-11 16:59:48 +08:00
jiaoyangna 0b5177748b 主题活动修改提交 2021-05-11 14:59:41 +08:00
jiaoyangna 847adfc761 主题活动提交 2021-05-10 20:20:20 +08:00
jiaoyangna f88ccd8f68 [主题活动修改提交] 2021-05-10 10:06:53 +08:00
jiaoyangna 7ec568e48d 新添加主题活动限时兑换跳转 2021-05-06 17:49:43 +08:00
ZhangBiao 81b82ea509 【云游商人】跨天红点不刷新修改 2021-04-30 15:27:47 +08:00
gaoxin d413915c6a 【竞技场】修复竞技场赛季切换时也会显示红点儿的问题 2021-04-29 17:12:12 +08:00
wangzhenxing e918945386 主城六星玉帝入口进入成长礼包滑动到指定条目 2021-04-28 00:32:55 +08:00
gaoxin 2a107e99cb 【红点】关闭一些重复注册的红点 2021-04-27 16:30:08 +08:00
gaoxin 7cbec8230a 【跳转】跳转充值,点返回没反应,再点直接返回主城 2021-04-27 15:45:49 +08:00
zhangqiang 959a40bca9 【头像】初始头像消失 2021-04-25 15:27:44 +08:00
zhangqiang 438bfea81a 【跳转】修改化虚坛跳转 2021-04-25 14:02:27 +08:00
gaoxin 12856c1287 【ui】修复跳转后导致tip报错 2021-04-22 16:50:45 +08:00
gaoxin 80a2b1a1f3 【跳转】跳转到大页签时强制关闭所有界面,副本界面关闭mask 2021-04-22 15:24:46 +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
ZhangBiao 2df3ac159c 【限时活动】完成?删除loggreen 2021-04-21 16:36:12 +08:00
wangzhenxing 8e24eea290 称号bug修改 2021-04-21 14:42:06 +08:00
jiaoyangna 61833b8b00 Merge branch '0功能/挂机界面' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2021-04-20 17:51:14 +08:00
jiaoyangna 86bc16f904 名字添加 2021-04-20 17:14:25 +08:00
jiaoyangna 45b9c8d81b 名字提交 2021-04-20 16:42:59 +08:00
jiaoyangna 089f0ce436 挂机提交 2021-04-20 16:09:56 +08:00
JLIOSM1 c31a82ef7f 【ios】lua文件格式修改 2021-04-20 13:58:00 +08:00
jiaoyangna 3738137554 【挂机演示优化】挂机界面增加其他玩家 2021-04-15 15:51:24 +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
JLIOSM1 e99b368abb 【adjust】修复打点错误 2021-04-11 04:21:55 +08:00
gaoxin 196dfa34dd 【GM】添加红点数据查看工具 2021-04-09 16:14:24 +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 ce8ffa9607 充值界面充值跳转月卡页签之后切换其他页签 界面显示错误 修改 2021-04-08 10:50:19 +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
gaoxin 9033d47109 【本地化】文本导出 2021-04-06 22:33:57 +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
ZhangBiao d69d96a321 【十五日登陆】红点 2021-04-02 11:53:07 +08:00
gaoxin b53717c9ee 【本地化】还原文本 2021-04-01 18:41:50 +08:00
gaoxin cbb28ebeae 【本地化】文本导出 2021-04-01 18:36:34 +08:00
ZhangBiao e86078ce69 【十五日登陆】 2021-04-01 16:04:13 +08:00
jiaoyangna a6428eaaed 红点 修改提交 2021-04-01 13:44:05 +08:00