Commit Graph

5628 Commits (923034957e987335601111e169d0172a67b9e2c1)
 

Author SHA1 Message Date
zhangqiang 3f903cf911 【神将合成】化虚坛和选择祭品界面添加长按头像功能 2021-04-20 10:17:57 +08:00
zhangqiang 1e688ab350 超值基金提交 2021-04-19 20:43:15 +08:00
zhangqiang d7913e5eab 超值基金,限时折扣,点击没反应修改 2021-04-19 20:42:11 +08:00
ZhangBiao 37003eea1b 【限时神装】更换背景图 2021-04-19 20:28:06 +08:00
ZhangBiao 24a8cbe9b0 Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-04-19 20:12:51 +08:00
ZhangBiao b9acaaa12c 【云游商人】完成 2021-04-19 19:44:54 +08:00
zhangqiang 3fb2bae218 英雄左右快速切换 ui 重叠 2021-04-19 19:36:43 +08:00
jiaoyangna f3fa2c9a99 挂机界面提交 2021-04-19 18:20:57 +08:00
zhangqiang 4bb6004ace 【英雄升星祭品】提交——3 2021-04-19 18:05:15 +08:00
gaoxin fbe886fc85 Merge branch 'china/dev' into china/dev-c 2021-04-19 16:15:12 +08:00
zhangqiang 1942875c2e 【图鉴重叠】 2021-04-19 16:14:51 +08:00
gaoxin d6cad28914 Merge branch 'china/dev' into china/dev-c 2021-04-19 16:14:18 +08:00
wangzhenxing bf6d29d677 【ID1008678】
【战斗统计优化】战斗统计中关卡敌人显示具体的星级和品质边框
2021-04-19 16:08:15 +08:00
ZhangBiao bb5268793e 【云游商人】提交 2021-04-19 15:43:25 +08:00
zhangqiang 46efdd02de 【英雄升星祭品】提交——02 2021-04-19 15:11:39 +08:00
gaoxin a7575c7d37 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-19 13:59:14 +08:00
gaoxin 2c80bc9953 【资源】同名资源文件处理修改 2021-04-19 13:59:01 +08:00
zhangqiang 9706cd776d Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-19 13:46:34 +08:00
zhangqiang de76c697c4 【英雄升星祭品】提交——01 2021-04-19 13:46:24 +08:00
jiaoyangna d101c5ce7b 名字修改提交 2021-04-19 13:02:37 +08:00
jiaoyangna efe1bdeab0 挂机界面修改 2021-04-19 11:58:22 +08:00
ZhangBiao 3005d9bf30 【云游商人】提交 2021-04-19 11:38:35 +08:00
jiaoyangna c94f1051da 挂机修改提交 2021-04-17 21:04:09 +08:00
zhangqiang 9b533fff0e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-17 17:50:24 +08:00
zhangqiang 1f6b8de581 【英雄详情】修改 2021-04-17 17:50:08 +08:00
jiaoyangna a277c5e6fa Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-17 17:20:58 +08:00
jiaoyangna fe837c22f4 Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
2021-04-17 17:20:52 +08:00
ZhangBiao 9891a41f22 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-04-17 17:12:34 +08:00
ZhangBiao 034d0846c5 【森罗幻境】提交 2021-04-17 17:12:24 +08:00
zhangqiang 21e35dc81b 去掉动画 2021-04-17 16:55:37 +08:00
zhangqiang 777a3f7b30 动画修改 2021-04-17 16:49:24 +08:00
ZhangBiao 11ea817c16 【云游商人】 2021-04-17 16:45:33 +08:00
zhangqiang af8aed7701 图鉴错乱修改 2021-04-17 16:35:38 +08:00
JieLing eb5cfeb7f8 【每日礼包】一键购买修改 2021-04-17 16:16:10 +08:00
JieLing f30d2f042e 【提审切换】开关活动 2021-04-17 16:16:03 +08:00
ZhangBiao 48720f5dff 【新人商城】资源提交
(cherry picked from commit 8922b7eaba)
2021-04-17 14:03:35 +08:00
ZhangBiao e08a50f30c 【云游商人】 2021-04-17 14:01:12 +08:00
zhangqiang 1ee7063569 【限时招募】 提交 2021-04-16 18:13:09 +08:00
jiaoyangna 296d75d193 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-16 18:06:38 +08:00
jiaoyangna 909078e7ae 【每日礼包】 修改提交 2021-04-16 18:06:33 +08:00
ZhangBiao 07cda7e58e 【云游商人】提交 2021-04-16 17:25:11 +08:00
jiaoyangna 12f1a42161 挂机报错 提交 2021-04-16 16:22:15 +08:00
ZhangBiao 98237651c9 Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼 2021-04-16 16:22:13 +08:00
ZhangBiao 78e320eb26 【云游商人】 2021-04-16 16:21:34 +08:00
wangzhenxing 4ea42d72a0 心魔试炼人物信息界面显示添加好友按钮 2021-04-16 16:12:43 +08:00
jiaoyangna 92104541fc Merge branch 'china/dev' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI.controller.meta
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_anim.controller.meta
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller
#	Assets/ManagedResources/EffectResUI/ChengHao/Animation/waixuan_UI_ctr.controller.meta
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
2021-04-16 15:42:39 +08:00
ZhangBiao 762aef88e0 【云游商人】提交 2021-04-16 14:58:40 +08:00
jiaoyangna f91b6f8ca1 资源重复修改提交 2021-04-16 14:53:44 +08:00
gaoxin 60ccfce6dc 【累计充值】第二次销毁时报错 2021-04-16 14:23:31 +08:00
jiaoyangna fc6f3bd6d1 活动修改提交 2021-04-16 14:18:58 +08:00