gaoxin
|
533885679c
|
【踏碎凌霄】boss放大添加
|
2021-04-27 13:32:41 +08:00 |
gaoxin
|
854c11affc
|
Merge remote-tracking branch 'origin/china/dev-c' into china/dev
|
2021-04-26 20:49:43 +08:00 |
ZhangBiao
|
cf1cf818e2
|
【战斗界面】上方血条移仓
|
2021-04-26 20:45:42 +08:00 |
ZhangBiao
|
171da338df
|
Revert "【战斗界面】上方血条问题修改"
This reverts commit 46d492529f .
|
2021-04-26 20:44:08 +08:00 |
ZhangBiao
|
91a569d918
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-26 20:42:58 +08:00 |
ZhangBiao
|
46d492529f
|
【战斗界面】上方血条问题修改
|
2021-04-26 20:42:49 +08:00 |
zhangqiang
|
3d1857dfcd
|
【前端拍脸修改】提交——2
|
2021-04-26 20:35:54 +08:00 |
zhangqiang
|
460ec366cb
|
【礼包】去掉LevelLinit 字段判断
|
2021-04-26 20:27:29 +08:00 |
zhangqiang
|
ca9594fefc
|
【超值基金】是否可购买判断修改
|
2021-04-26 20:08:32 +08:00 |
gaoxin
|
357a27c100
|
Merge remote-tracking branch 'origin/剧情' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/Story/wukongJuqing.jpg.meta
# Assets/ManagedResources/Atlas/Story/wzs.jpg.meta
# Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta
# Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-04-26 19:03:05 +08:00 |
jiaoyangna
|
8b8d0a3956
|
剧情 提交
|
2021-04-26 18:57:54 +08:00 |
ZhangBiao
|
24937470ad
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-26 18:46:27 +08:00 |
ZhangBiao
|
90fbe78773
|
【积天豪礼】提交
|
2021-04-26 18:46:19 +08:00 |
jiaoyangna
|
637aa36041
|
剧情提交
|
2021-04-26 18:29:47 +08:00 |
gaoxin
|
7df1514da8
|
Merge branch 'china/dev' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
|
2021-04-26 17:55:43 +08:00 |
ZhangBiao
|
2770e6da31
|
Merge branch 'china/dev-c' into 0活动开发聚集地/踏碎凌霄
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_XinJiangLaiXi/ArtFont/p_pozhengzhuxian_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/b_bianhuanmoce_banner_zh.jpg.meta
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-04-26 17:18:02 +08:00 |
ZhangBiao
|
73588be932
|
【踏碎凌霄】
|
2021-04-26 17:12:39 +08:00 |
ZhangBiao
|
8269afe74d
|
【踏碎凌霄】回访
|
2021-04-26 16:53:36 +08:00 |
ZhangBiao
|
98f12190ea
|
【踏碎凌霄】
|
2021-04-26 16:46:03 +08:00 |
ZhangBiao
|
31b9eb3057
|
【踏碎凌霄】
|
2021-04-26 16:20:22 +08:00 |
wangzhenxing
|
62112ecff0
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-26 15:45:43 +08:00 |
wangzhenxing
|
ebde6e43b0
|
[功能]========【ID1008784】 【活动优化】增加成长礼包入口跳转功能
|
2021-04-26 15:45:30 +08:00 |
zhangqiang
|
154e048796
|
【十五日登陆】无可领取奖励时,入口消失
|
2021-04-26 15:19:11 +08:00 |
zhangqiang
|
b4ed183fc6
|
【前端拍脸修改】提交——1
|
2021-04-26 13:44:31 +08:00 |
zhangqiang
|
26e63d7c9e
|
【月卡】累冲金额调整
|
2021-04-26 12:11:02 +08:00 |
jiaoyangna
|
f38e838967
|
特权商城跳转到对应礼包位置
|
2021-04-26 10:38:57 +08:00 |
ZhangBiao
|
b0d0fab6d5
|
【踏碎凌霄】提交
|
2021-04-26 10:23:19 +08:00 |
wangzhenxing
|
7a5d44a8f2
|
【战斗】============被动313修改
|
2021-04-26 10:00:11 +08:00 |
jiaoyangna
|
15ef116032
|
剧情提交
|
2021-04-26 09:41:41 +08:00 |
gaoxin
|
e25750d948
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-25 21:30:31 +08:00 |
gaoxin
|
2a4b70f212
|
【回放】修复战斗回放时报错
|
2021-04-25 21:30:25 +08:00 |
wangzhenxing
|
324c93e93f
|
【战斗】==============被动313修改
|
2021-04-25 19:50:54 +08:00 |
gaoxin
|
9874f5b42a
|
【新人商城】法宝直升25级提示添加
|
2021-04-25 19:26:58 +08:00 |
ZhangBiao
|
072b7713c2
|
【恭喜获得】界面结构调整
|
2021-04-25 17:40:49 +08:00 |
gaoxin
|
0adf5574ed
|
【活动】快速切换页签时会出现报错
|
2021-04-25 17:01:32 +08:00 |
gaoxin
|
23e5b50dc4
|
【活动】修复极速达人打开界面报错
|
2021-04-25 16:52:11 +08:00 |
gaoxin
|
229b7165ee
|
【挂机】第五账地图偶现死循环卡死
|
2021-04-25 16:49:08 +08:00 |
gaoxin
|
1c69c62ab7
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-25 16:05:16 +08:00 |
gaoxin
|
4a33407d27
|
【挂机】修复部分章节卡死
|
2021-04-25 16:05:11 +08:00 |
wangzhenxing
|
efa66c0130
|
【战斗】=========被动313 修改
|
2021-04-25 15:53:24 +08:00 |
wangzhenxing
|
26d50be57c
|
【战斗】================增加313被动
|
2021-04-25 15:46:08 +08:00 |
zhangqiang
|
959a40bca9
|
【头像】初始头像消失
|
2021-04-25 15:27:44 +08:00 |
ZhangBiao
|
39329ce5cc
|
【踏碎凌霄提交】
|
2021-04-25 15:07:36 +08:00 |
zhangqiang
|
b113f5c221
|
【送神祠】放生灵兽,选择单只灵兽,碎片会出现黑色图片
|
2021-04-25 14:57:45 +08:00 |
wangzhenxing
|
63caca8a31
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-25 14:27:00 +08:00 |
wangzhenxing
|
8bece9b87b
|
副本入口立绘位置修改
|
2021-04-25 14:25:40 +08:00 |
zhangqiang
|
2b595bb8f5
|
【跳转】化虚坛跳转修改2
|
2021-04-25 14:20:07 +08:00 |
zhangqiang
|
438bfea81a
|
【跳转】修改化虚坛跳转
|
2021-04-25 14:02:27 +08:00 |
gaoxin
|
89f201d8f9
|
【引导战斗】添加跳过功能
|
2021-04-25 11:41:15 +08:00 |
gaoxin
|
379de4fed0
|
【活动】每日礼包不再在界面中刷新数据,会导致死循环
|
2021-04-25 11:14:14 +08:00 |
ZhangBiao
|
6a0a230eb6
|
【踏碎凌霄】
|
2021-04-23 19:37:15 +08:00 |
ZhangBiao
|
325421e04c
|
【踏碎凌霄】提交
|
2021-04-23 17:56:57 +08:00 |
ZhangBiao
|
03a19bdd14
|
【森罗无尽】没有小人修复
|
2021-04-23 16:19:44 +08:00 |
ZhangBiao
|
b3f3336fdc
|
【踏碎凌霄】提交
|
2021-04-23 16:18:56 +08:00 |
ZhangBiao
|
c2e97f144d
|
【森罗无尽】小人消失i修改
|
2021-04-23 16:04:28 +08:00 |
ZhangBiao
|
a9c21bc78a
|
【踏碎凌霄】
|
2021-04-23 15:39:46 +08:00 |
wangzhenxing
|
898edb53be
|
[功能]==========聊天称号特效显示修改
|
2021-04-23 14:46:37 +08:00 |
ZhangBiao
|
bd236f0f32
|
【踏碎凌霄】
|
2021-04-23 14:12:24 +08:00 |
ZhangBiao
|
2df671ce67
|
【云游商人】装备穿戴卸下 道具消失报错
|
2021-04-23 10:19:38 +08:00 |
jiaoyangna
|
42b91c0a4e
|
剧情提交
|
2021-04-22 18:13:28 +08:00 |
ZhangBiao
|
75be84bbff
|
【云游商人】怎加妖晶数量检测
|
2021-04-22 18:12:16 +08:00 |
ZhangBiao
|
99602b3008
|
【云游商人】问号,红点修改
|
2021-04-22 18:00:53 +08:00 |
ZhangBiao
|
9ba655847b
|
Merge branch 'china/dev-c' into 0活动开发聚集地/踏碎凌霄
|
2021-04-22 17:23:31 +08:00 |
ZhangBiao
|
de6ac55599
|
【踏碎凌霄】
|
2021-04-22 17:22:49 +08:00 |
zhangqiang
|
d373b1ff0f
|
【累积充值】金额斜了
|
2021-04-22 16:54:20 +08:00 |
ZhangBiao
|
045b0d80b3
|
【限时活动】奖励顺序调整
|
2021-04-22 15:53:47 +08:00 |
ZhangBiao
|
b6350ad492
|
【踏碎凌霄】
|
2021-04-22 15:40:21 +08:00 |
zhangqiang
|
2b122d7fee
|
【公会援助】每次点击援助,列表都会重新置顶显示
|
2021-04-22 15:31:03 +08:00 |
jiaoyangna
|
a8393f2fb1
|
Merge branch 'china/dev-c' into 剧情
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-04-22 15:09:00 +08:00 |
jiaoyangna
|
a0ecd56968
|
剧情提交
|
2021-04-22 15:06:47 +08:00 |
ZhangBiao
|
eb9d3ed21c
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-22 10:59:53 +08:00 |
ZhangBiao
|
8117c5ebba
|
【云游商人】怎加红点
|
2021-04-22 10:59:32 +08:00 |
zhangqiang
|
720e9a2d75
|
【日常副本】“今日剩余次数”修改为“今日剩余免费次数”——3
|
2021-04-22 10:20:42 +08:00 |
zhangqiang
|
18984a9885
|
【邮件】已领取的附件图标上对应标志消失
|
2021-04-21 21:03:13 +08:00 |
ZhangBiao
|
35c89e734d
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-21 20:24:23 +08:00 |
ZhangBiao
|
8e76fc3e5d
|
【云游商人】提交
|
2021-04-21 20:24:06 +08:00 |
zhangqiang
|
e1cfc900b1
|
【送神祠跳转】仙缘余晨跳转送神祠,前往的是分解宝物页签
|
2021-04-21 20:09:58 +08:00 |
zhangqiang
|
6e5bec75bf
|
【百宝斋】杂货商店和魂印商店免费次数到达上限的红点加回来——2
|
2021-04-21 19:53:13 +08:00 |
zhangqiang
|
9d773c0532
|
【日常副本优化】首次挑战副本不再消耗次数 —— 2
|
2021-04-21 18:14:28 +08:00 |
ZhangBiao
|
146929c099
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-04-21 18:06:43 +08:00 |
ZhangBiao
|
5eca5dd50e
|
【珍奇宝阁】双倍修改
(cherry picked from commit 0d4bacbe8297a34561275fe0c5720ff38e349769)
|
2021-04-21 18:06:35 +08:00 |
zhangqiang
|
bf895d04d1
|
【百宝斋】杂货商店和魂印商店免费次数到达上限的红点加回来
|
2021-04-21 17:49:58 +08:00 |
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
|
9b9d3cb1e9
|
礼包死循环修改提交
|
2021-04-20 17:39:02 +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 |
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 |
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 |
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
|
034d0846c5
|
【森罗幻境】提交
|
2021-04-17 17:12: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 |
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 |
gaoxin
|
60ccfce6dc
|
【累计充值】第二次销毁时报错
|
2021-04-16 14:23:31 +08:00 |
jiaoyangna
|
fc6f3bd6d1
|
活动修改提交
|
2021-04-16 14:18:58 +08:00 |
wangzhenxing
|
c544767e29
|
[功能]===========新手引导提交,心魔试炼排行榜添加玩家信息
|
2021-04-16 14:09:36 +08:00 |
jiaoyangna
|
dafce7d9eb
|
礼包刷新界面死循环修改
|
2021-04-16 11:22:18 +08:00 |
ZhangBiao
|
e142d0aad6
|
Merge branch 'china/dev-c' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
|
2021-04-16 11:13:52 +08:00 |
ZhangBiao
|
6064633a28
|
【云游商人】资源提交
|
2021-04-16 11:12:17 +08:00 |
jiaoyangna
|
444e1e4428
|
限时招募提交
|
2021-04-16 10:08:33 +08:00 |
jiaoyangna
|
5f9144f4e5
|
挂机多人开启条件添加
|
2021-04-15 21:05:27 +08:00 |
jiaoyangna
|
5f29447434
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-15 20:37:00 +08:00 |
jiaoyangna
|
c844a72609
|
【神将图鉴】图鉴和已有神将的详情或者传说互相切换,就会为空
|
2021-04-15 19:54:30 +08:00 |
gaoxin
|
8eb6c30d95
|
【战斗】战斗开始时清除轮转方法,(伏虎罗汉无限攻击的bug)
|
2021-04-15 19:05:01 +08:00 |
ZhangBiao
|
72b4c2288f
|
Merge branch 'china/dev' into 0活动开发聚集地/神尊_云游_新人_周卡_豪礼
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua
|
2021-04-15 17:21:28 +08:00 |
zhangqiang
|
3a4d593fdb
|
【礼包 公会援助】列表刷新置顶问题
|
2021-04-15 16:25:00 +08:00 |
jiaoyangna
|
3738137554
|
【挂机演示优化】挂机界面增加其他玩家
|
2021-04-15 15:51:24 +08:00 |
ZhangBiao
|
4b429e2a87
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-15 14:57:01 +08:00 |
ZhangBiao
|
ac6697b461
|
【森罗】提交
|
2021-04-15 14:56:51 +08:00 |
zhangqiang
|
b37f61f988
|
【宝物分解】
|
2021-04-15 14:35:19 +08:00 |
ZhangBiao
|
d5879c2445
|
【森罗幻境】暂时还原
|
2021-04-15 14:24:40 +08:00 |
ZhangBiao
|
5d47d0b42e
|
【森罗】排序,选择相同将,修复
|
2021-04-15 12:26:47 +08:00 |
ZhangBiao
|
204e922062
|
【礼包判空】略过id=0的礼包
|
2021-04-15 10:28:09 +08:00 |
zhangqiang
|
68658a50c9
|
【宝物分解】
|
2021-04-15 09:56:33 +08:00 |
ZhangBiao
|
fff121933f
|
【森罗幻境】选择相同神将报错修复
|
2021-04-15 09:35:24 +08:00 |
ZhangBiao
|
12a4d787c2
|
|
2021-04-14 20:11:53 +08:00 |
ZhangBiao
|
16625adb84
|
|
2021-04-14 20:06:07 +08:00 |
ZhangBiao
|
5ae5555011
|
【森罗幻境】选择英雄按战力发送英雄顺序
|
2021-04-14 20:00:06 +08:00 |
ZhangBiao
|
de85b844e5
|
【逐圣商店】取消主胜商店红点
|
2021-04-14 17:41:44 +08:00 |
ZhangBiao
|
c8cd41670b
|
【至尊豪礼】提交
|
2021-04-14 17:20:55 +08:00 |
ZhangBiao
|
c686791e73
|
【至尊豪礼】资源提交
|
2021-04-14 14:48:30 +08:00 |
ZhangBiao
|
61670e86fc
|
【新人商城】完成
|
2021-04-14 14:01:14 +08:00 |
ZhangBiao
|
8922b7eaba
|
【新人商城】资源提交
|
2021-04-14 12:00:06 +08:00 |
zhangqiang
|
8cf7de1811
|
【大闹天宫】试炼节点显示有问题
|
2021-04-13 18:26:37 +08:00 |
zhangqiang
|
6d21fd41fb
|
【大闹天宫】试炼节点显示bug
|
2021-04-13 17:14:29 +08:00 |
ZhangBiao
|
2214d15550
|
【福星高照】拍脸增加主线引导冲突限制
|
2021-04-13 17:12:28 +08:00 |
zhangqiang
|
0e8f87f32e
|
【魂印战力计算】bug
|
2021-04-13 16:34:30 +08:00 |
gaoxin
|
e013f396b3
|
【引导战斗】所有剧情放到战斗里
|
2021-04-13 15:10:40 +08:00 |
ZhangBiao
|
3e6d68ee34
|
【福星高照】关闭upview
|
2021-04-13 14:39:35 +08:00 |
ZhangBiao
|
6e87c6b41c
|
【十五日登录】奖励领完不关闭修复
|
2021-04-13 14:06:42 +08:00 |
gaoxin
|
f210a35821
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-13 00:38:39 +08:00 |
gaoxin
|
a895a311d7
|
【超值基金】修改开启根据豪华月卡
|
2021-04-13 00:38:31 +08:00 |
ZhangBiao
|
41c34b4a9b
|
【十五日登录】连续点击报错提交
|
2021-04-12 23:33:16 +08:00 |
gaoxin
|
0958baf1c0
|
【图鉴】皮肤显示打开
|
2021-04-12 22:30:46 +08:00 |
ZhangBiao
|
4de980bf34
|
【十五日登陆】不改了
|
2021-04-12 20:02:56 +08:00 |
ZhangBiao
|
bcfb68a40a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 19:29:14 +08:00 |