Commit Graph

67 Commits (9e19cd5322a7b5a69afb0cb7a0384928c23cdcf5)

Author SHA1 Message Date
jiaoyangna 9e19cd5322 红点提交 2021-03-23 14:13:02 +08:00
jiaoyangna 629971d137 文本还原提交 2021-02-20 16:55:28 +08:00
guowei 6c191263bd Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.proto
#	Assets/ManagedResources/~Lua/Message/Expedition.proto
#	Assets/ManagedResources/~Lua/Message/Family.proto
#	Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
2021-01-06 20:05:35 +08:00
gaoxin bf6fd2d13d Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/View/UpView.lua
2020-12-26 20:22:23 +08:00
jiaoyangna 1f05f5f8f6 逍遥游 红点提交 2020-12-24 16:19:46 +08:00
jiaoyangna 3a6e07bf1c 【逍遥游优化】逍遥游玩法优化内容 2020-12-23 20:18:43 +08:00
ZhangBiao d0b94a1c3b 【新将活动】新将来袭、新疆招募、升星有礼 提交 2020-12-23 14:36:15 +08:00
ZhangBiao 12760d7cb1 【升星有礼】完成 2020-12-21 15:41:31 +08:00
guowei 4f4542d53a 【鸿蒙阵】 2020-12-18 13:39:35 +08:00
ZhangBiao a5c36cf58a 【灵兽宝阁】未开启更换灵兽版本 2020-11-12 17:11:18 +08:00
zhangqiang 3479bd153c 【灵兽系统】 合并 功能ok 但是战斗合完进不去 2020-10-31 17:01:46 +08:00
ZhangBiao 0bf6e05add 【社稷大典】提交6 2020-10-24 18:58:07 +08:00
gaoxin f53a566ce8 【逍遥游】功能入口随功能开启添加 2020-10-19 22:57:02 +08:00
yuanshuai 131d1aab1b 【逍遥游】红点和帮助弹窗提交 2020-10-19 21:39:48 +08:00
zhangqiang f2d3f045aa 森罗幻境提交1 2020-10-12 14:46:05 +08:00
liujiaqi 783c61eed8 修复新玩家登陆卡在登陆100% 2020-09-27 20:40:20 +08:00
zhangqiang 96ab48c22f 遴选 线上活动: 三周活动 寻宝达人 四周 天宫达人2 有中文表 2020-09-27 16:14:42 +08:00
zhangqiang bd6fdce461 遴选 线上活动 : 三周活动 寻宝达人 四周 天宫达人 2020-09-27 16:12:21 +08:00
zhangqiang d8013ccd8c 打开充值每日礼包 和 成长礼包 红点检测 2020-09-21 16:40:18 +08:00
jiaoyangna 5a861862d5 商店添加动画 2020-09-04 16:54:58 +08:00
ZhangBiao 04b18aa4ad 竞技场有免费次数 时提示红点 2020-09-03 14:42:31 +08:00
ZhangBiao c3b0f590d2 好友增加一键领取红点 2020-09-03 10:50:25 +08:00
ZhangBiao e74c120d01 大闹天宫重置红点、无尽副本界面红点 2020-09-01 11:25:38 +08:00
jiaoyangna 2bf39b8a9c 副本红点提交 2020-08-31 15:01:20 +08:00
jiaoyangna 366343b72b 副本红点修改提交 2020-08-31 13:58:47 +08:00
ZhangBiao a99aa6ef6e 还是红点检测 2020-08-28 17:29:38 +08:00
ZhangBiao 01fc7cae51 森罗幻境奖励红点 2020-08-28 13:48:09 +08:00
ZhangBiao cdc5c07b84 天宫秘宝在副本界面的红点 2020-08-28 10:36:09 +08:00
ZhangBiao 811418e222 森罗 无尽红点 2020-08-27 13:59:14 +08:00
ZhangBiao dc9615b4fc 无尽进图武神将问题、取消对话战斗结束神将数据界面 2020-08-26 16:22:37 +08:00
zhangqiang 4d19e7ce98 中文表导出提交 2020-08-25 15:46:38 +08:00
jiaoyangna 8fb4e8cf13 Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-25 11:22:05 +08:00
jiaoyangna 9ad0593572 qinglong redpoint commit 2020-08-25 11:21:42 +08:00
zhangqiang a5c401bd34 提交 2020-08-24 20:55:03 +08:00
zhangqiang 8f72af20cc 公会副本提交 达人排行修改 2020-08-22 18:03:43 +08:00
ZhangBiao baaee2e547 2020-08-21 18:56:00 +08:00
jiaoyangna 7592690072 2020-08-28 18:07:50 +08:00
jiaoyangna 8c17479fd6 破阵诛仙活动 调整 2020-08-28 17:46:07 +08:00
ZhangBiao aa551923b1 破阵诛仙 珍奇宝阁 2020-08-20 18:32:14 +08:00
jiaoyangna 6b0af3d7fb pozhenzhuxian commit 2020-08-20 17:36:19 +08:00
jiaoyangna 4e1236de8c qinglongserecttreasure commit 2020-08-19 10:05:01 +08:00
ZhangBiao 2063690199 2020-08-14 23:34:23 +08:00
jiaoyangna b2f5dbc2ca xuanyuan update 2020-08-13 14:43:44 +08:00
jiaoyangna 937d46ff75 xuanyuan commit 2020-08-12 21:10:47 +08:00
jiaoyangna e0359bb37a encoding upate 2020-08-06 17:52:32 +08:00
jiaoyangna 5f20e3e100 fixed bug 2020-08-03 13:37:21 +08:00
jiaoyangna 01e5a62715 #115003 UnityLogError
E:/Git/JL/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua:373: table index is nil ,
UnityEngine.Application.CallLogCallback(String, String, LogType, Boolean)   公会红包红点的问题
2020-08-03 10:36:45 +08:00
gaoxin 0a19c1dd82 优化红点检测机制为分帧刷新,优化人物升级红点检测 2020-08-01 13:15:27 +08:00
jiaoyangna b2af34a2b3 副本红点提交 2020-07-29 17:50:15 +08:00
ZhangBiao 48ac527f1a 限时召唤 乾坤宝盒 页面整合 2020-07-28 09:48:02 +08:00