Commit Graph

6549 Commits (cc16057438b631643f5c812a13542378cd71ed1a)

Author SHA1 Message Date
gaoxin 9d0c42f0ca 【配置】添加硬核渠道,先遣打包配置,热更删除默认密码 2021-06-24 13:54:48 +08:00
gaoxin 5cf66021e2 【打包】quick打包场景提交 2021-06-24 13:47:44 +08:00
zhangqiang 8cdb8123e3 【美术 -特权优化】快捷任务底框换一个更明显的,突出文字 2021-06-23 18:08:54 +08:00
jiaoyangna e7352701e7 主题活动修改提交 2021-06-23 15:11:32 +08:00
jiaoyangna 1c89a4218c 假人骑牛修改 2021-06-23 11:05:53 +08:00
jiaoyangna e5a491b7b9 随机人物修改提交 2021-06-23 10:20:03 +08:00
jiaoyangna 8b3e5dbae4 config build 提交 2021-06-22 20:41:51 +08:00
jiaoyangna 97da91abc3 buildconfig 修改提交 2021-06-22 20:37:34 +08:00
gaoxin 24c2de4c6d 【公告】修改公告在分子包时配置的字段 2021-06-22 17:51:14 +08:00
gaoxin efca8d1244 【称号】修复老包中称号报错 2021-06-22 17:42:18 +08:00
jiaoyangna 274f315d2b 大圣购买修改 2021-06-22 10:08:42 +08:00
jiaoyangna cb37edbba0 秘宝间隔调整 2021-06-21 18:26:31 +08:00
ZhangBiao 252aff3423 【月卡激活】如果购买的礼包不弹恭喜获得,就不会提示已激活月卡,待下次任意界面弹恭喜获得才会提示 2021-06-21 17:37:34 +08:00
ZhangBiao 0dc5976dd0 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-06-21 16:57:31 +08:00
ZhangBiao fe16795d8c 【主城】右上伸缩条闪烁修改 2021-06-21 16:57:22 +08:00
gaoxin e888e3987e 【资源】草花背景资源还原 2021-06-21 16:32:03 +08:00
gaoxin 3f320f1e89 【降妖夺宝】修复协程导致报错 2021-06-21 14:12:33 +08:00
zhangqiang 057e32fe52 【福星高照】领取完所有奖励后,按钮红点不消失 2021-06-21 13:52:41 +08:00
ZhangBiao ba5bc832d9 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-21 11:45:13 +08:00
ZhangBiao 4fdbc4a559 【降妖夺宝】抽卡跳转修改 2021-06-21 11:45:03 +08:00
jiaoyangna 77dea82a94 【ID1016745】
【升级豪礼】新到的图片资源,需要替换
2021-06-21 11:42:19 +08:00
jiaoyangna 0014224024 【ID1016741】
【界面UI】全面屏手机界面适配异常
2021-06-21 11:30:50 +08:00
jiaoyangna daba103fdb 【ID1016741】
【界面UI】全面屏手机界面适配异常
2021-06-21 11:06:23 +08:00
jiaoyangna be75375dd6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-21 10:53:42 +08:00
jiaoyangna 0f309447c2 【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
2021-06-21 10:53:24 +08:00
ZhangBiao cf38744969 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-21 10:52:04 +08:00
ZhangBiao 428df0c41d 【降妖夺宝】限时商市道具光效穿透 2021-06-21 10:51:55 +08:00
zhangqiang 8152d96e1e 【福星高照】领取完所有奖励后,按钮红点不消失 2021-06-21 10:42:27 +08:00
jiaoyangna e5ff298534 Revert "【ID1016740】"
This reverts commit 343b92aff9.
2021-06-21 10:38:09 +08:00
jiaoyangna 343b92aff9 【ID1016740】
【每日豪礼】先遣测试包礼文案丢失,本地正常
2021-06-21 10:36:33 +08:00
jiaoyangna 3feebf1ef6 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-21 10:22:25 +08:00
jiaoyangna c2f6c54063 【ID1016741】
【界面UI】全面屏手机界面适配异常
2021-06-21 10:22:21 +08:00
ZhangBiao 65794931b3 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-21 09:51:52 +08:00
ZhangBiao 8c0980e750 【降妖夺宝】十连上方资源显示修改 2021-06-21 09:51:44 +08:00
jiaoyangna 46efd9b960 关闭帮助界面 2021-06-19 17:50:23 +08:00
jiaoyangna f4fe155533 大圣修改 2021-06-19 17:47:35 +08:00
jiaoyangna b85b94fa68 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-19 17:07:20 +08:00
jiaoyangna 15361c2ef5 大圣跳转 2021-06-19 17:07:17 +08:00
wangzhenxing 5184ced8c8 [战斗]==============免疫buff清除提示修改 2021-06-19 16:41:00 +08:00
jiaoyangna 8342399870 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-19 15:50:56 +08:00
jiaoyangna 46621252d9 惊喜礼包拍脸修改 2021-06-19 15:50:39 +08:00
gaoxin d11833e088 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-19 15:46:05 +08:00
gaoxin 04c89ccaa9 【月卡】月卡激活提示修改到关闭奖励界面之后 2021-06-19 15:45:13 +08:00
jiaoyangna b6b55590b3 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-19 15:29:41 +08:00
jiaoyangna 67e5cbf8c9 大圣 不能查看详情修改 2021-06-19 15:29:31 +08:00
gaoxin 6d4d1fc49b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-19 15:28:27 +08:00
gaoxin b423005b6e 【活动】页签使用原图大小 2021-06-19 15:28:22 +08:00
jiaoyangna 2e693575a6 抽卡提示只在神将抽里出现 2021-06-19 15:00:37 +08:00
jiaoyangna bf1e1f69e6 添加以领取标志 2021-06-18 19:13:51 +08:00
jiaoyangna 89facf0425 添加红点检测 2021-06-18 19:04:44 +08:00
jiaoyangna 883fdceb78 Merge branch '0功能/升星预览' into china/dev-c 2021-06-18 19:00:51 +08:00
jiaoyangna e267c0096b 预设提交 2021-06-18 18:56:46 +08:00
jiaoyangna 45a1079d88 大圣提交 2021-06-18 18:55:04 +08:00
ZhangBiao 9e5819433e 【新将来袭】 2021-06-18 18:45:56 +08:00
ZhangBiao a957834228 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-18 18:38:29 +08:00
ZhangBiao 70a90b0148 【新将来袭】在线刷新修改 2021-06-18 18:38:17 +08:00
gaoxin e0a3b3837c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-18 18:31:26 +08:00
jiaoyangna 60b2cf1cf6 Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
2021-06-18 18:27:01 +08:00
gaoxin f85dc798d3 【公告】公告id添加对不同渠道的处理 2021-06-18 18:25:51 +08:00
jiaoyangna e562176180 超凡入圣提交 2021-06-18 18:24:04 +08:00
ZhangBiao ddfe59a1d0 【升星有礼】 2021-06-18 18:17:36 +08:00
ZhangBiao a05df3c77e 【升星有理】 2021-06-18 18:10:58 +08:00
ZhangBiao 78d2efc59c 【惊喜礼盒】提交 2021-06-18 18:01:27 +08:00
ZhangBiao 683964cd8a 【惊喜礼盒】资源更换 2021-06-18 17:52:09 +08:00
ZhangBiao 165a724ba3 【升星有理】 2021-06-18 17:29:00 +08:00
ZhangBiao 15172dab87 【升星有礼】 2021-06-18 17:17:52 +08:00
ZhangBiao 3744d8b901 【降妖夺宝】剩余时间限时修改 2021-06-18 17:06:20 +08:00
ZhangBiao 33866686ba Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-18 17:01:12 +08:00
ZhangBiao a277f4578c 【升星有礼】重构提交 2021-06-18 17:00:52 +08:00
gaoxin 7fe73cca9e Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
2021-06-18 16:04:33 +08:00
gaoxin e88dcb7863 【热更】脚本优化,添加自动打tag的功能 2021-06-18 16:03:27 +08:00
jiaoyangna 12e0a2d0bb 拍脸修改提交 2021-06-18 15:53:42 +08:00
gaoxin 11934333fc 【技能】金吒技能特效新增 2021-06-18 15:29:07 +08:00
jiaoyangna 993bba8e0a 拍脸修改提交
(cherry picked from commit 8012c5691a)
2021-06-18 15:17:35 +08:00
jiaoyangna 8012c5691a 拍脸修改提交 2021-06-18 15:17:10 +08:00
ZhangBiao a60e8a4329 【惊喜礼盒】底部回弹位置低 2021-06-18 15:06:53 +08:00
jiaoyangna e593381b77 降妖夺宝修改提交
(cherry picked from commit 106647a69c)
2021-06-18 14:48:23 +08:00
jiaoyangna 106647a69c 降妖夺宝修改提交 2021-06-18 14:47:39 +08:00
ZhangBiao 6e617123b7 【新将来袭降妖夺宝】 2021-06-18 14:47:13 +08:00
gaoxin 21875c589f 【称号】称号特效显示兼容处理 2021-06-18 11:31:49 +08:00
gaoxin 74c5cd04c4 【配置】开启高帧率 2021-06-18 11:17:11 +08:00
jiaoyangna 09095e5b16 Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
2021-06-18 11:08:40 +08:00
jiaoyangna 8b55bf1dc1 隐藏不显示的预设 2021-06-18 11:03:51 +08:00
jiaoyangna 65c09118ed 拍脸修改提交 2021-06-18 10:59:35 +08:00
jiaoyangna c07ddcc6a8 拍脸修改提交
(cherry picked from commit 4635361d8b)
2021-06-18 10:50:21 +08:00
jiaoyangna 10c86e509a 超凡入圣修改提交 2021-06-18 10:50:04 +08:00
jiaoyangna 4635361d8b 拍脸修改提交 2021-06-18 10:48:49 +08:00
zhangqiang 667e53769a 【巅峰赛】8强界面不显示玩家名字 2021-06-17 20:53:33 +08:00
ZhangBiao f02639f80b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-17 20:31:55 +08:00
ZhangBiao 958f2774e5 【新将来袭、降妖夺宝】重构提交 2021-06-17 20:31:47 +08:00
jiaoyangna 004121df8b 拍脸提交 2021-06-17 19:59:09 +08:00
jiaoyangna 8102e82829 资源提交 2021-06-17 19:33:16 +08:00
ZhangBiao 6ca32cdde3 【惊喜礼盒】提交 2021-06-17 18:50:19 +08:00
jiaoyangna 208c11555c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-17 18:17:42 +08:00
jiaoyangna c102ce2478 拍脸修改提交 2021-06-17 18:17:38 +08:00
ZhangBiao c9bf69310c 【升级豪礼】代码丢了,不是按照等级显示,需要重新修改 2021-06-17 18:05:39 +08:00
ZhangBiao bd4796a4af 【惊喜礼盒】右侧文字格式修改 2021-06-17 18:04:10 +08:00
jiaoyangna e5cacccd8a Merge branch 'china/dev-inner' into china/dev-c 2021-06-17 17:57:44 +08:00
jiaoyangna 687a9ea45d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-17 17:57:39 +08:00
jiaoyangna 4c1cd67e6e Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner 2021-06-17 17:56:51 +08:00