Commit Graph

3030 Commits (c1276ff0c4972d22e29afd9896e75538d05b641e)

Author SHA1 Message Date
zhangqiang 76c9760993 Merge branch 'china/dev' into 0功能/称号坐骑皮肤
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab
2021-03-29 17:56:19 +08:00
zhangqiang db6f2d0b32 【称号坐骑时装】提交 2021-03-29 17:53:40 +08:00
gaoxin 3ecded4430 【假战斗优化】运营活动、充值活动相关的假战斗跳过改为直接解锁,而不需要等玩家到达30级 2021-03-29 17:11:25 +08:00
gaoxin 91e13dc314 【超值基金】月卡不开超值基金不显示 2021-03-29 16:52:23 +08:00
zhangqiang cbdfb75576 【称号坐骑时装】提交 2021-03-29 16:45:04 +08:00
jiaoyangna c16e912777 成长礼包,每日礼包修改提交 2021-03-29 15:16:32 +08:00
gaoxin 2a0ce862ae 【红点添加】限时兑换添加红点提示-关闭红点log 2021-03-29 14:54:13 +08:00
gaoxin a599ef10f9 【红点添加】限时兑换添加红点提示 2021-03-29 14:37:15 +08:00
zhangqiang 51bb90edce 【称号坐骑时装】 协议 无尽副本修改 2021-03-29 12:07:28 +08:00
jiaoyangna e7dff66a4f 品阶错误修改 2021-03-29 10:15:25 +08:00
ZhangBiao e0d05e175e 【福星高照】提交 2021-03-29 09:52:53 +08:00
zhangqiang 9637337c39 【称号坐骑时装】 修改提交 2021-03-27 20:01:39 +08:00
jiaoyangna c131b4e521 每日豪礼修改
(cherry picked from commit da3b21d024)
2021-03-27 19:26:59 +08:00
jiaoyangna da3b21d024 每日豪礼修改 2021-03-27 19:25:04 +08:00
JieLing 5883b66fca 【十绝阵】开服3天内通过公会御令获取途径可以进入 2021-03-27 17:44:05 +08:00
gaoxin 0688f20ad6 【心魔试炼】排行榜有空格 2021-03-27 15:32:59 +08:00
gaoxin fbfb02fc34 【聊天】公会消息缓存添加,暂时删除公会红包跑马灯 2021-03-27 14:58:57 +08:00
zhangqiang 095701c33f 【称号时装坐骑】初提 2021-03-26 20:06:08 +08:00
gaoxin d48458f417 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-26 14:33:21 +08:00
gaoxin a1778caa65 【公会红包】修复充值后报错扽问题 2021-03-26 14:33:12 +08:00
ZhangBiao ad3b3c3e45 【牛气冲不动了】 2021-03-26 14:05:25 +08:00
ZhangBiao dc187723c8 【牛气冲天】upview修改2
(cherry picked from commit 5d33070a00ca7b5c337522e0eb1b94cac304391e)
2021-03-26 14:00:30 +08:00
ZhangBiao b7cff350f9 【牛气冲天】修改 2021-03-26 13:56:01 +08:00
ZhangBiao 3c31b5b5bd Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-26 13:49:56 +08:00
ZhangBiao dc50f89214 【牛气冲天】upview提交 2021-03-26 13:49:41 +08:00
gaoxin b18ad8487a 【战斗】casting层级调整,失败界面打开1秒后才能关闭 2021-03-26 12:15:48 +08:00
gaoxin cb15f601b3 【聊天】去除登录之前的消息不显示的限制 2021-03-26 11:31:14 +08:00
gaoxin 1801a3d820 【十绝阵】排名数据超过20,滑动时显示错误的问题 2021-03-26 11:17:46 +08:00
ZhangBiao b7c51cbf48 【牛气冲天】红点bug提交
(cherry picked from commit af8f9e0f409980ed6c85b205cb2c0503b4c9e301)
2021-03-25 16:33:33 +08:00
jiaoyangna cfa67e8479 删除log 2021-03-25 15:34:57 +08:00
jiaoyangna 299a7ceff1 【天书秘卷】 修改 2021-03-25 15:34:05 +08:00
ZhangBiao 3b99759f6f 【牛气冲天】报空修复
(cherry picked from commit 756e920596af01046ab53a971423b77243a42678)
2021-03-25 15:20:19 +08:00
ZhangBiao 16853d09c3 【牛气冲天】物品特效、红点检测
(cherry picked from commit 11fb7cc1876c48ec26617da94405812861c4b4b1)
2021-03-25 15:02:13 +08:00
ZhangBiao 0a4d9a925b 【牛气冲天】主城报错提交 2021-03-25 11:35:25 +08:00
ZhangBiao 24fa8c17e2 Merge branch '0活动开发聚集地/牛气冲天' into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-03-25 11:13:37 +08:00
ZhangBiao 304a175fc8 【牛气冲天】完成 2021-03-25 11:00:58 +08:00
jiaoyangna 4f188f1ef1 未进版本功能隐藏 2021-03-25 10:57:54 +08:00
jiaoyangna 646f3ae5de 新字不消失修改 2021-03-25 10:42:42 +08:00
ZhangBiao 5768d133f0 【牛气冲天】提交 2021-03-25 10:34:11 +08:00
ZhangBiao 3a5b35a399 【牛气冲天】提交 2021-03-25 09:58:36 +08:00
gaoxin 17f0a9ed1e 【bug】零元礼包不再算做充值,修复第一天领取零元礼包,第二天充值会解锁第二天的首充礼包,但不能领取的问题。同时修复领取0元礼包也会导致自动弹出首充的问题。 2021-03-24 21:06:02 +08:00
zhangqiang d00236d6d0 【称号 时装 坐骑】 协议数据提交 2021-03-24 21:05:31 +08:00
ZhangBiao e8219c11b0 【牛气冲天】提交 2021-03-24 20:19:40 +08:00
jiaoyangna f972b1646a 主题活动提交 2021-03-24 18:16:30 +08:00
jiaoyangna b0887238d0 主题活动修改提交 2021-03-24 18:01:33 +08:00
ZhangBiao 481540080b 【牛气冲天】提交 2021-03-24 17:06:20 +08:00
zhangqiang 6f0593707f 【十绝阵个人排行】不显示玩家名字 2021-03-24 16:32:31 +08:00
zhangqiang 4939c4da92 【称号坐骑时装】部分资源提交 2021-03-24 16:31:14 +08:00
ZhangBiao b63845938a 【牛气冲天】提交 2021-03-24 13:43:56 +08:00
jiaoyangna 54586ae204 天书秘卷提交 2021-03-24 10:55:33 +08:00
ZhangBiao 2c5159fc11 【五级图标显示】 2021-03-24 09:48:35 +08:00
jiaoyangna 3bd78655a2 灵兽提交 2021-03-23 20:33:21 +08:00
ZhangBiao c9670aae58 【五级前不显示任何活动】 2021-03-23 20:28:31 +08:00
gaoxin 8644d27aaa 【界面优化】部分界面显示优化修改 2021-03-23 17:26:16 +08:00
jiaoyangna 1f036b6793 添加头像置灰 2021-03-23 17:20:48 +08:00
jiaoyangna fbed4d34ff 解锁条件修改 2021-03-23 17:10:04 +08:00
jiaoyangna 298946dd2d Merge branch 'china/dev' into 0功能/天书秘卷
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-03-23 16:54:46 +08:00
jiaoyangna 44806a302d 红点提交 2021-03-23 16:52:19 +08:00
gaoxin c5d1dab173 【养成】升级时,战力光效层级不正确 2021-03-23 16:34:19 +08:00
zhangqiang 3618464a15 【车迟斗法】排行榜显示问题,加载20名会重新置顶显示,播放动画会显示空格 2021-03-23 16:22:57 +08:00
gaoxin 8b62a5cd43 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-23 16:15:40 +08:00
gaoxin 3a8a8ddeeb 【登录】流程修改,添加错误码处理 2021-03-23 16:15:32 +08:00
jiaoyangna 001d6e16bc 主城入口提交 2021-03-23 16:02:22 +08:00
zhangqiang c4c5bb1074 【神将没有升级材料依旧会出现小红点】 2021-03-23 15:53:59 +08:00
jiaoyangna 3334257425 添加天书秘卷入口 2021-03-23 15:37:39 +08:00
zhangqiang a56d71c4f8 【公会副本】bug修改 2021-03-23 15:25:00 +08:00
jiaoyangna cfa63c1830 筛选提交 2021-03-23 15:23:37 +08:00
jiaoyangna 2e31e176cc 红点提交 2021-03-23 15:16:38 +08:00
jiaoyangna 218110d709 筛选排序提交 2021-03-23 14:56:13 +08:00
jiaoyangna 9e19cd5322 红点提交 2021-03-23 14:13:02 +08:00
gaoxin 96fb520ace 【百宝斋】竞技场赛季过渡以后,去百宝斋里点击下方大页签可以正常进入逐胜商店并购买,但是切换 逐胜/公会,这种小页签 就提示赛季已结束不让进 2021-03-23 11:17:55 +08:00
jiaoyangna cd984427c1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-23 11:00:25 +08:00
jiaoyangna b859239c90 首充跳转修改 2021-03-23 10:59:59 +08:00
ZhangBiao 83040f2c87 【主城】预设结构调整 2021-03-23 09:54:11 +08:00
ZhangBiao 7bac8e3d8c 【八日领奖】需要改成可查看宝箱 2021-03-22 20:56:36 +08:00
ZhangBiao dc38d33738 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-22 20:42:02 +08:00
ZhangBiao dcc09321dd 【自选宝箱】按钮覆盖修改 2021-03-22 20:41:51 +08:00
gaoxin 7fb9a6ea71 【战斗】主动上报日志功能关闭 2021-03-22 20:37:34 +08:00
ZhangBiao 207d85e2a2 【牛气冲天】提交 2021-03-22 20:08:18 +08:00
gaoxin d7ac77375f 【bug】修复公会boss点击挑战再返回伤害列表不显示的问题 2021-03-22 19:50:01 +08:00
gaoxin 3c98337b33 【bug】战斗跳过未解锁文字提示修改 2021-03-22 19:44:24 +08:00
jiaoyangna a79e67097e 天书秘卷提交 2021-03-22 17:05:00 +08:00
gaoxin c3961b9501 【公会】邀请,红包,副本文字显示修改 2021-03-22 16:25:10 +08:00
jiaoyangna 08f41d473c 天书秘卷提交 2021-03-22 16:22:55 +08:00
zhangqiang d9dcba2574 【称号坐骑皮肤-----------】开始 2021-03-22 16:16:25 +08:00
jiaoyangna 56ee509832 天书秘卷 提交 2021-03-22 15:28:27 +08:00
jiaoyangna a4facd8d13 天书秘卷 2021-03-22 15:16:29 +08:00
gaoxin 4b8f5cd535 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-22 13:54:18 +08:00
gaoxin f2de4a8a53 【大闹天宫】圣物品质框默认+3 2021-03-22 13:54:14 +08:00
zhangqiang 830f7d3dd9 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-22 13:48:06 +08:00
zhangqiang dc5d0a2d12 【修复主城人物层级bug】 2021-03-22 13:47:59 +08:00
ZhangBiao 3d665074a2 【牛气冲天】提交 2021-03-22 11:09:49 +08:00
gaoxin 7e0e5e198a 【sdk】添加上传支付订单id的接口 2021-03-20 22:12:51 +08:00
gaoxin fccfeedba0 【sdk】避免出现sdk初始化慢导致无法自动打开登录界面的问题 2021-03-20 15:00:44 +08:00
ZhangBiao cae60a1318 【自选宝箱】界面调整 2021-03-19 23:54:24 +08:00
ZhangBiao 2f658f1157 【装备种类显示】 2021-03-19 21:30:22 +08:00
gaoxin da1ad31e4c 【bug】修复兑换码按钮不显示的问题 2021-03-19 21:01:27 +08:00
gaoxin 835ebf10c7 【bug】头像,头像框判断是否要进入版本 2021-03-19 20:24:39 +08:00
gaoxin 61ada763b2 【bug】修复好友请求无法正常显示的问题 2021-03-19 18:41:25 +08:00
gaoxin 9fe7b94196 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-19 18:14:57 +08:00
gaoxin c6674710f9 【引导】2倍速引导增加 2021-03-19 18:14:52 +08:00
zhangqiang 853db67d9a 【化虚坛去掉屏蔽神将】 2021-03-19 18:00:46 +08:00
gaoxin 37668ce757 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-19 17:52:41 +08:00
gaoxin fd1ea5fa67 【引导】npc修改 2021-03-19 17:52:36 +08:00
ZhangBiao 0adef18b30 【大闹天宫】战斗结束点击无反应 2021-03-19 17:05:26 +08:00
jiaoyangna 66287434ea 天书秘卷 提交 2021-03-19 16:53:00 +08:00
ZhangBiao dfb4de8811 【限时神装】时间格式修改 2021-03-19 16:30:34 +08:00
ZhangBiao f30186c57e 【关卡】应该改成按钮 2021-03-19 16:18:10 +08:00
ZhangBiao 65f994b37b 【牛气冲天】提交 2021-03-19 15:16:49 +08:00
jiaoyangna ec8ff74e61 Merge branch 'china/dev' into 0功能/天书秘卷 2021-03-19 15:11:37 +08:00
jiaoyangna beb93b5ed9 天书秘卷 2021-03-19 14:37:24 +08:00
gaoxin 1b3e9460fe Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-19 14:19:13 +08:00
gaoxin e9968d8517 【语言功能】自动切换语言修改为可配置,修改游戏中设置语言按钮的位置 2021-03-19 14:19:05 +08:00
zhangqiang 194160cc40 【2倍速修改】 2021-03-19 11:45:08 +08:00
gaoxin dfcd8e7eb1 【tapdb】userid改为账号id 2021-03-19 11:37:50 +08:00
gaoxin 367f319b81 【优化】删除登录区服显示 2021-03-19 11:37:22 +08:00
gaoxin 2842fed5e3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-19 11:10:55 +08:00
gaoxin d5d88bbb8a 【引导】删除假战斗 2021-03-19 11:10:48 +08:00
jiaoyangna cbfad48efb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-19 11:09:11 +08:00
jiaoyangna f51a4305ab 每日豪礼修改提交 2021-03-19 11:08:58 +08:00
ZhangBiao 037d8414d4 【升级豪礼】从第一个开始 2021-03-19 10:33:37 +08:00
ZhangBiao c4700534c4 【限时神装】假战斗报错 2021-03-18 23:18:43 +08:00
ZhangBiao 477d3b768a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 21:15:11 +08:00
ZhangBiao e9e002310b 【大闹天宫】 2021-03-18 21:15:03 +08:00
wangzhenxing 6569aaaf08 【假战斗】剧情添加跳过 2021-03-18 20:53:46 +08:00
jiaoyangna c9f20bf928 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 18:36:24 +08:00
jiaoyangna b9c5d93f0f 【每日豪礼】领完不消失 2021-03-18 18:36:21 +08:00
zhangqiang 0ced995afe 【分解魂印提示】分解魂印提示不当(策划说改成,金色或金色以上) 2021-03-18 16:13:47 +08:00
zhangqiang cc9b681875 【碎片】用碎片合成神将点击查看详情有问题 2021-03-18 16:09:44 +08:00
zhangqiang 7a6a0b1451 【贪婪节点修改】 2021-03-18 15:53:44 +08:00
ZhangBiao f704847601 2021-03-18 15:51:14 +08:00
ZhangBiao b1013b0069 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 15:23:23 +08:00
ZhangBiao 7001e46f6c 2021-03-18 15:23:14 +08:00
zhangqiang 6cb698f147 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 15:16:13 +08:00
zhangqiang e8acbe1c86 【自选箱提交】 2021-03-18 15:15:54 +08:00
ZhangBiao f8d0c03e63 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 15:15:32 +08:00
ZhangBiao e8928e062d 【道具自选箱】 2021-03-18 15:15:16 +08:00
gaoxin 115e4aaa18 【红点】成长礼包红点不显示修复 2021-03-18 15:02:13 +08:00
ZhangBiao b479a8fa8b 首领来袭 2021-03-18 14:40:47 +08:00
ZhangBiao db3340d779 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 14:10:29 +08:00
ZhangBiao 97ae8966d7 【充值界面】 2021-03-18 14:10:23 +08:00
gaoxin 5e423f2ebe 【灵兽】灵兽入口随功能状态显隐 2021-03-18 13:36:01 +08:00
gaoxin 6246da5bb6 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 12:03:57 +08:00
gaoxin 811594ef57 【bug】修复好友列表不能滑动的问题 2021-03-18 12:03:51 +08:00
jiaoyangna f49d2b76f0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 12:01:39 +08:00
jiaoyangna e7803d68c8 逍遥boss 提交 2021-03-18 12:01:35 +08:00
ZhangBiao 63b9348e54 充值界面 2021-03-18 11:31:10 +08:00
jiaoyangna 0209a90c27 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-03-18 11:13:26 +08:00
jiaoyangna 11a5cf2a99 【首充】孙悟空页面详情天赋显示错误 2021-03-18 11:13:10 +08:00
zhangqiang 88b1230c42 【本地化魂印】专属魂印适用范围不显示 2021-03-18 10:41:54 +08:00