Commit Graph

5426 Commits (a7dc372bb775b80cd9dc86d3ce1ac839fb81f58c)
 

Author SHA1 Message Date
zhangqiang a7dc372bb7 【英雄升星祭品】提交——5 2021-04-20 19:58:07 +08:00
jiaoyangna 61833b8b00 Merge branch '0功能/挂机界面' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
2021-04-20 17:51:14 +08:00
jiaoyangna 20cf3f88a9 挂机修改提交 2021-04-20 17:42:53 +08:00
jiaoyangna c7f4c57585 点数修改 2021-04-20 17:21:32 +08:00
jiaoyangna 86bc16f904 名字添加 2021-04-20 17:14:25 +08:00
jiaoyangna 45b9c8d81b 名字提交 2021-04-20 16:42:59 +08:00
jiaoyangna 8590617839 名字提交 2021-04-20 16:31:41 +08:00
jiaoyangna 089f0ce436 挂机提交 2021-04-20 16:09:56 +08:00
zhangqiang ab3a0c3a75 【限时活动优化】界面布局与效果图不符 2021-04-20 15:11:23 +08:00
jiaoyangna 5b2ddbf8e6 点数调整 2021-04-20 15:10:41 +08:00
jiaoyangna 0fdb6b608d 名字提交 2021-04-20 15:07:10 +08:00
jiaoyangna 1e04dcc200 名字提交 2021-04-20 14:52:02 +08:00
jiaoyangna 9cf2502a10 删除log 2021-04-20 14:00:53 +08:00
zhangqiang aae0749f1a 【英雄升星祭品】提交 ——4 2021-04-20 13:48:55 +08:00
zhangqiang d7a74e8256 【归元优化】确认归元弹窗的神将头像改为固定显示在左侧第一位 2021-04-20 11:43:24 +08:00
zhangqiang 189e0f6062 【魂印优化】魂印界面的神将头像框颜色,改为当前神将实际星级对应的颜色 2021-04-20 11:24:19 +08:00
zhangqiang 7aefe7f4db 【日常副本】“今日剩余次数”修改为“今日剩余免费次数” 2021-04-20 11:19:17 +08:00
zhangqiang a4727e6de7 【升星优化】选择祭品神将页面,按照神将图鉴排序的反向规则进行排列,使珍贵的神将排序更为靠后,本体仍放在最后的位置 2021-04-20 11:13:03 +08:00
zhangqiang bee0fa412e 【神将合成】化虚坛和选择祭品界面添加长按头像功能 2 2021-04-20 10:38:28 +08:00
zhangqiang 3f903cf911 【神将合成】化虚坛和选择祭品界面添加长按头像功能 2021-04-20 10:17:57 +08:00
ZhangBiao 37003eea1b 【限时神装】更换背景图 2021-04-19 20:28:06 +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
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
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
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
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