Commit Graph

4924 Commits (53f095011e6966b15d035f06acfa737b0c79f28c)
 

Author SHA1 Message Date
ZhangBiao 53f095011e 【牛气冲天】特效层级修改
(cherry picked from commit 53308beca2)
(cherry picked from commit 672b5acd10caeca26906c4c9ddfb840fd3b121df)
2021-04-02 19:29:39 +08:00
jiaoyangna 3b229cd8fc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-02 17:13:29 +08:00
jiaoyangna 1b4807a144 itemview 关闭时设为true 2021-04-02 17:13:26 +08:00
zhangqiang 855c7159b8 【巅峰赛】尝试修改去掉注释 2021-04-02 16:01:26 +08:00
zhangqiang a73924a275 【称号坐骑时装】取消注释 2021-04-02 15:47:40 +08:00
zhangqiang c45d20f9da 【巅峰赛】尝试修改 2021-04-02 15:47:07 +08:00
zhangqiang 7bea1cf11a 【巅峰赛】尝试修改 2021-04-02 15:42:36 +08:00
gaoxin 125dedddf8 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-02 15:28:27 +08:00
wangzhenxing 8650cfe6a7 language表提交 2021-04-02 15:19:20 +08:00
gaoxin 528f2cdc51 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-02 15:12:59 +08:00
gaoxin 53912b5384 【屏幕适配】CanvasScaler添加到config 2021-04-02 15:12:39 +08:00
wangzhenxing ef374b841a [战斗]======破盾,清除提示文字修改 2021-04-02 15:02:14 +08:00
jiaoyangna db5a0557ea 签到界面宝箱弹出框修改 2021-04-02 14:04:21 +08:00
jiaoyangna 57604c4c76 成长礼包提交 2021-04-02 11:41:50 +08:00
jiaoyangna c9a3a40acf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-02 11:25:04 +08:00
jiaoyangna 640c866388 成长礼包 红点修改 2021-04-02 11:24:59 +08:00
ZhangBiao 8cf3c62bbf Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-02 10:53:49 +08:00
ZhangBiao 2688f37d72 【牛气冲天】增加特效
(cherry picked from commit f8b01c8e8d)
2021-04-02 10:53:29 +08:00
jiaoyangna 223afd4c57 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-02 10:45:54 +08:00
jiaoyangna 6de42f5b43 限时兑换红点提交 2021-04-02 10:45:11 +08:00
ZhangBiao 26b1480da9 【牛气冲天】奖励图标大小修改
(cherry picked from commit 02d431c4f6)
(cherry picked from commit cd40a6172dbdd86439ba395d791fbba796c5e8e9)
2021-04-02 10:15:21 +08:00
zhangqiang fc95cfb52c 【巅峰赛 bug】 三局两胜 第三场不刷新bug 3 2021-04-02 09:55:55 +08:00
zhangqiang 881cc1717b 【巅峰赛 bug】 三局两胜 第三场不刷新bug +2 2021-04-02 09:55:32 +08:00
zhangqiang 3d8fd5a748 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-01 20:26:56 +08:00
zhangqiang e4da98bff6 【bug修改】 2021-04-01 20:26:43 +08:00
ZhangBiao 4927a85f01 【自选宝箱】无特效修改 2021-04-01 20:22:15 +08:00
jiaoyangna 28c8ee841d 每日礼包加锁修改 提交 2021-04-01 19:05:43 +08:00
jiaoyangna c18b59502a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-01 19:04:13 +08:00
jiaoyangna 053f890498 成长礼包修改提交 2021-04-01 19:04:01 +08:00
zhangqiang abe9d67927 十绝阵奖励】领奖阶段,未被领取的箱子可以查看到奖励 2021-04-01 19:02:47 +08:00
jiaoyangna 8884dd4920 文本导出 2021-04-01 18:54:28 +08:00
jiaoyangna a81c48c533 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Operating/CumulativeSignInPage.lua
2021-04-01 18:52:58 +08:00
jiaoyangna cff04dc520 签到 修改 2021-04-01 18:50:06 +08:00
ZhangBiao 54870cd601 【牛气冲天】动画修改
(cherry picked from commit 6e62ebd50a)
2021-04-01 18:42:52 +08:00
gaoxin cbb28ebeae 【本地化】文本导出 2021-04-01 18:36:34 +08:00
wangzhenxing acfe38c973 [战斗]==========被动263 被动168修改 2021-04-01 17:11:54 +08:00
zhangqiang 2497735700 【关卡】在25级关卡和27级关卡,卡等级的时候,“挑战关卡”按钮是置灰的 2021-04-01 16:21:35 +08:00
jiaoyangna 0e752b76a6 每日礼包 换天自动刷新修改 2021-04-01 16:12:20 +08:00
jiaoyangna a71f489265 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-01 15:43:20 +08:00
gaoxin 335d2cb7ec Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-01 15:43:00 +08:00
jiaoyangna b21ed5a44e 礼包修改提交 2021-04-01 15:42:59 +08:00
gaoxin 4cfda03826 【音频】音效更新 2021-04-01 15:26:36 +08:00
jiaoyangna b663c351b3 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-01 14:56:50 +08:00
jiaoyangna ae17483a8e 灵兽 修改提交 2021-04-01 14:56:47 +08:00
zhangqiang 1d4c446c33 【大闹天宫】复活节点无法复活助战神将 2021-04-01 14:46:07 +08:00
zhangqiang aa17c175b7 【无尽副本】阵亡神将可以一键上阵 2021-04-01 14:05:21 +08:00
jiaoyangna a6428eaaed 红点 修改提交 2021-04-01 13:44:05 +08:00
jiaoyangna 9bfd85bb0a Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-01 12:30:59 +08:00
jiaoyangna c70343585a 主题活动 修改 2021-04-01 12:30:37 +08:00
zhangqiang a20dc99f99 【大闹天宫】挑战失败后显示两个可挑战图标,点击另一个未挑战过的怪没反应,退出重进显示正常 2021-04-01 10:39:03 +08:00