luyao
|
d63abe2679
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 15:12:04 +08:00 |
luyao
|
ed9ea5c3f9
|
bat鎵瑰鐞嗚嚜鍔ㄦ帹閫?2021/07/22,15:11:34
|
2021-07-22 15:11:34 +08:00 |
jiaoyangna
|
457ee33353
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 14:17:44 +08:00 |
jiaoyangna
|
ce8751bbee
|
乾坤宝盒 提示修改
|
2021-07-22 14:17:40 +08:00 |
ZhangBiao
|
190f3722a8
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 14:04:11 +08:00 |
ZhangBiao
|
63c2a33c84
|
【报错修改】
|
2021-07-22 11:40:13 +08:00 |
ZhangBiao
|
5fa9f25c09
|
【点将台】白片修改
|
2021-07-22 10:53:27 +08:00 |
ZhangBiao
|
443ecf9112
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 10:36:45 +08:00 |
ZhangBiao
|
b7d7b3270a
|
【主题活动】分页处理
|
2021-07-22 10:36:35 +08:00 |
zhangqiang
|
5c5edd8a13
|
【资源冲突处理】
|
2021-07-22 10:28:50 +08:00 |
zhangqiang
|
e28d538565
|
【资源冲突处理】
|
2021-07-22 10:23:09 +08:00 |
ZhangBiao
|
2bf92fdfdd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-21 18:37:25 +08:00 |
ZhangBiao
|
683e0eefc4
|
【心愿抽卡】界面调整
|
2021-07-21 18:37:15 +08:00 |
jiaoyangna
|
5150fd2edf
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-21 18:27:17 +08:00 |
jiaoyangna
|
c131d41d58
|
装备界面改动
|
2021-07-21 18:27:03 +08:00 |
ZhangBiao
|
30edf664da
|
Merge branch 'china/dev' into 0优化/新增心愿神将提示
|
2021-07-21 18:26:34 +08:00 |
ZhangBiao
|
2b08ff111e
|
【心愿抽卡】去除log
|
2021-07-21 18:26:12 +08:00 |
ZhangBiao
|
183cd238d3
|
【心愿抽卡】完成
|
2021-07-21 18:22:24 +08:00 |
jiaoyangna
|
1d2ed2a4f7
|
装备详情弹窗下方获取途径位置显示错误
|
2021-07-21 18:03:23 +08:00 |
jiaoyangna
|
8477043738
|
装备详情弹窗下方获取途径位置显示错误
|
2021-07-21 17:38:27 +08:00 |
ZhangBiao
|
b0e53312e7
|
【心愿抽卡】增加英雄加入卡池的天数条件
|
2021-07-21 17:35:38 +08:00 |
jiaoyangna
|
399d90809d
|
装备详情弹窗下方获取途径位置显示错误
|
2021-07-21 17:32:07 +08:00 |
jiaoyangna
|
d1abaf403c
|
装备详情弹窗下方获取途径位置显示错误
|
2021-07-21 17:23:14 +08:00 |
JLIOSM1
|
d680e5a507
|
Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua.meta
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua.meta
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua.meta
# Assets/StreamingAssets/Res/PackConfig.txt
# Assets/StreamingAssets/Res/_ReadMe.md
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png.meta
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png.meta
# Assets/StreamingAssets/Res/loading1.png
# Assets/StreamingAssets/Res/loading1.png.meta
# Assets/StreamingAssets/Res/loading2.png
# Assets/StreamingAssets/Res/loading2.png.meta
# Assets/StreamingAssets/Res/loading3.png
# Assets/StreamingAssets/Res/loading3.png.meta
# Assets/StreamingAssets/Res/loading4.png
# Assets/StreamingAssets/Res/loading4.png.meta
# Assets/StreamingAssets/Res/loading5.png
# Assets/StreamingAssets/Res/loading5.png.meta
# Assets/StreamingAssets/Res/loading6.png
# Assets/StreamingAssets/Res/loading6.png.meta
# Assets/StreamingAssets/Res/loading_caohua.png.meta
# Assets/StreamingAssets/Res/loading_xipu.png.meta
# Assets/StreamingAssets/Res/login_caohua.png.meta
# Assets/StreamingAssets/Res/login_video.mp4.meta
# Assets/StreamingAssets/Res/login_xipu.png.meta
|
2021-07-21 17:15:36 +08:00 |
JLIOSM1
|
9009c07630
|
【StreamingAsset】修改Res文件夹的内容
|
2021-07-21 17:08:01 +08:00 |
jiaoyangna
|
4442b9c38b
|
【ID1017598】
【灵兽白泽活动】点击查看红色装备TIPS后,切换至灵兽白泽互动点击金色装备,弹出的装备TIPS中会多出套装属性
|
2021-07-21 16:54:38 +08:00 |
JLIOSM1
|
d1a82b5132
|
【IOS】打开文本的方式兼容IOS
|
2021-07-21 16:49:54 +08:00 |
JLIOSM1
|
12a8fd2417
|
【IOS】添加IOS热更新配置,修改热更新文件名连接符为下划线
|
2021-07-21 16:48:45 +08:00 |
JLIOSM1
|
e694302cac
|
【MapPlayerView】随机方法修改
|
2021-07-21 16:41:33 +08:00 |
jiaoyangna
|
cc0e0c20cb
|
【ID1017607】
【仙缘汇聚箱】箱子可领取点击后关闭,动效消失,切换界面箱子再次跳动
|
2021-07-21 16:19:36 +08:00 |
JLIOSM1
|
3027e991c9
|
【IOS提审】提审服关闭公会红包,无尽秘宝按钮显示
|
2021-07-21 14:55:47 +08:00 |
jiaoyangna
|
e2f381b11a
|
【ID1017469】
【五星成长礼拍脸】背包界面合成五星神将,切到关卡或主城才给拍脸
|
2021-07-21 11:53:26 +08:00 |
jiaoyangna
|
896bf742c1
|
【ID1017463】
【超值基金】在界面刷新后页签和主城入口没红点,重登正常
|
2021-07-21 11:37:04 +08:00 |
JLIOSM1
|
c2dfe0ee92
|
【IOS提审】链接提审服时,部分按钮跳转到妖晶充值
|
2021-07-21 11:33:09 +08:00 |
JLIOSM1
|
557d19910d
|
【屏幕适配】优化剧情界面在宽屏设备下的显示
|
2021-07-21 11:30:13 +08:00 |
jiaoyangna
|
740592309d
|
【ID1017508】
【点将台】道具足够10连抽时,10连按钮没有红点
|
2021-07-21 11:22:56 +08:00 |
zhangqiang
|
5625ca9f15
|
Merge branch 'china/dev_c_跨服天梯' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua
|
2021-07-20 18:35:51 +08:00 |
zhangqiang
|
a359ff284f
|
【跨服主城按钮修改】
|
2021-07-20 18:32:02 +08:00 |
zhangqiang
|
b395410ac1
|
Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-07-20 18:09:07 +08:00 |
jiaoyangna
|
f3ada0f401
|
时间间隔修改
|
2021-07-20 17:18:20 +08:00 |
jiaoyangna
|
5cac652fa3
|
滑动修改提交
|
2021-07-20 17:08:36 +08:00 |
JieLing
|
cff3a5647c
|
Merge branch 'china/dev' into china/test
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua
|
2021-07-20 16:41:36 +08:00 |
JieLing
|
fb5b009ec8
|
Merge remote-tracking branch 'origin/china/dev' into china/zf_test
|
2021-07-20 15:44:34 +08:00 |
jiaoyangna
|
1e80b80c82
|
四元阵修改提交
|
2021-07-20 15:42:11 +08:00 |
jiaoyangna
|
058cd565d3
|
抽卡动画修改提交
|
2021-07-20 14:52:55 +08:00 |
jiaoyangna
|
f0337c6ce8
|
抽卡修改提交
|
2021-07-20 14:31:31 +08:00 |
jiaoyangna
|
ee26dc5196
|
跳转修改提交
|
2021-07-20 14:18:28 +08:00 |
jiaoyangna
|
a88bebb284
|
滑动修改提交
|
2021-07-20 14:02:16 +08:00 |
jiaoyangna
|
acbdf46600
|
跳转 修改提交
|
2021-07-20 13:46:13 +08:00 |
jiaoyangna
|
7cf1150c52
|
四元阵预设修改提交
|
2021-07-20 12:37:14 +08:00 |