Commit Graph

3480 Commits (f1538a47764ba6c0fc0f2661a7e0d6de18b1b952)

Author SHA1 Message Date
ZhangBiao f1538a4776 【限时活动】提交 2021-04-21 16:49:34 +08:00
ZhangBiao 6d08ce59a6 Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼 2021-04-21 16:36:35 +08:00
ZhangBiao 2df3ac159c 【限时活动】完成?删除loggreen 2021-04-21 16:36:12 +08:00
zhangqiang cf3758d19b 【三界降魔】活动结束后的提示文字优化 2021-04-21 15:47:21 +08:00
ZhangBiao eab420381c Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-04-21 15:02:04 +08:00
ZhangBiao aa834ad136 【限时活动】重构完成 2021-04-21 15:00:20 +08:00
wangzhenxing 8e24eea290 称号bug修改 2021-04-21 14:42:06 +08:00
zhangqiang 78220a5cf9 【珍奇宝阁】修改 2021-04-21 14:32:43 +08:00
jiaoyangna 993d891c2b Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-04-21 14:31:32 +08:00
jiaoyangna 70b4ebdf83 容错修改 2021-04-21 14:31:26 +08:00
zhangqiang 048f1bafb9 【进度条优化】当进度条上限为1时,将进度条所在位置显示在最右侧 2021-04-21 14:30:15 +08:00
zhangqiang f4ca18ff74 【日常副本优化】首次挑战副本不再消耗次数 2021-04-21 11:45:55 +08:00
ZhangBiao 30361f5393 【限时活动】调整提交 2021-04-21 11:37:55 +08:00
wangzhenxing eff7ceb60c 【ID1008821】
【主界面优化】当右侧未显示区域入口按钮有红点提示时,主界面闪烁显示向右的箭头
2021-04-21 10:50:18 +08:00
ZhangBiao 5043002676 【限时活动】限时兑换 2021-04-20 21:15:38 +08:00
zhangqiang 991fb61f57 【英雄升星祭品】提交——6 2021-04-20 20:59:43 +08:00
ZhangBiao a7bd34cdad 【限时活动】结构调整 2021-04-20 20:32:36 +08:00
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
ZhangBiao d1bbe68ebf 【限时活动】增加日限时累充 2021-04-20 17:41:48 +08:00
jiaoyangna c7f4c57585 点数修改 2021-04-20 17:21:32 +08:00
jiaoyangna 86bc16f904 名字添加 2021-04-20 17:14:25 +08:00
ZhangBiao 2051a59d74 【达人活动】结构调整 2021-04-20 16:43:16 +08:00
jiaoyangna 45b9c8d81b 名字提交 2021-04-20 16:42:59 +08:00
jiaoyangna 089f0ce436 挂机提交 2021-04-20 16:09:56 +08:00
jiaoyangna 5b2ddbf8e6 点数调整 2021-04-20 15:10:41 +08:00
jiaoyangna 1e04dcc200 名字提交 2021-04-20 14:52:02 +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
ZhangBiao b2df6d1282 【云游商人】 2021-04-20 11:17:50 +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
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 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
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 efe1bdeab0 挂机界面修改 2021-04-19 11:58:22 +08:00
ZhangBiao 3005d9bf30 【云游商人】提交 2021-04-19 11:38:35 +08:00