ZhangBiao
|
edc728227c
|
【寻宝密宗】提交
|
2021-08-10 14:57:45 +08:00 |
zhangqiang
|
5e891ff84b
|
【鸿蒙阵】步骤:共鸣效果100级,上阵共鸣神将,在化虚坛中进阶该神将,进阶后在鸿蒙阵把该神将卸下,并在神将情报界面升级,升级后重登,还原错误的天赋,但保留错误的等级
|
2021-08-10 14:56:34 +08:00 |
zhangqiang
|
0e0d5ffdb0
|
【鸿蒙阵】步骤:共鸣效果100级,上阵共鸣神将,在化虚坛中进阶该神将,进阶后在鸿蒙阵把该神将卸下,并在神将情报界面升级,升级后重登,还原错误的天赋,但保留错误的等级
|
2021-08-10 14:52:07 +08:00 |
ZhangBiao
|
d7aa6d66f9
|
【无尽副本】特效穿透提交
|
2021-08-09 17:35:22 +08:00 |
ZhangBiao
|
ed0f5296d1
|
【寻宝迷踪】提交
|
2021-08-09 17:11:30 +08:00 |
gaoxin
|
54c0a74afa
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-09 16:52:33 +08:00 |
gaoxin
|
b0d5798448
|
【登录】维护状态提示文字修改
|
2021-08-09 16:52:21 +08:00 |
jiaoyangna
|
615cc24f09
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-09 16:50:04 +08:00 |
jiaoyangna
|
278530583d
|
牛气冲天跳转返回之后页签跳到第一个修改
|
2021-08-09 16:49:41 +08:00 |
gaoxin
|
8e43418825
|
【服务器】服务器选择界面每次打开时都重新获取一遍服务器列表数据
|
2021-08-09 16:32:14 +08:00 |
gaoxin
|
c4c57893ea
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-09 16:31:24 +08:00 |
jiaoyangna
|
dfb6132bc5
|
牛气冲天跳转神将抽卡
|
2021-08-09 16:21:46 +08:00 |
jiaoyangna
|
cef09d39d8
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-09 16:14:35 +08:00 |
jiaoyangna
|
206fd6793b
|
牛气冲天跳转点将台修改提交
|
2021-08-09 16:13:24 +08:00 |
gaoxin
|
639dbcac80
|
【服务器】选择服务器时维护状态提示文字修改
|
2021-08-09 16:13:20 +08:00 |
zhangqiang
|
c957a96983
|
【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级
|
2021-08-09 14:48:14 +08:00 |
ZhangBiao
|
aae540d144
|
【寻宝迷踪】提交
|
2021-08-09 14:18:31 +08:00 |
gaoxin
|
ac8927f4e6
|
【登录】修改服务器维护状态下,登录时的提示文字
|
2021-08-09 14:10:54 +08:00 |
ZhangBiao
|
0520c4c685
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-09 10:01:11 +08:00 |
jiaoyangna
|
97de80b9cd
|
图鉴提交
|
2021-08-06 17:19:44 +08:00 |
jiaoyangna
|
1adf97eddc
|
四元阵适配修改
|
2021-08-06 16:56:26 +08:00 |
ZhangBiao
|
f40d297086
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-06 14:21:48 +08:00 |
ZhangBiao
|
87b7f4d7c8
|
【天宫秘宝】礼包购买逻辑修复
|
2021-08-06 14:21:27 +08:00 |
ZhangBiao
|
ab0dece261
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-06 11:32:10 +08:00 |
ZhangBiao
|
4dc9136405
|
【寻宝迷踪】提交
|
2021-08-06 11:31:41 +08:00 |
jiaoyangna
|
6b8c2f2f3c
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
|
2021-08-06 11:15:13 +08:00 |
ZhangBiao
|
4edc9a855b
|
【寻宝迷踪】提交
|
2021-08-05 17:23:25 +08:00 |
gaoxin
|
360cbbf54f
|
【公告】报错修改
|
2021-08-05 16:34:05 +08:00 |
jiaoyangna
|
5336505935
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-05 15:10:04 +08:00 |
jiaoyangna
|
ed3494e263
|
【ID1009947】
【优化】四元阵界面 新增界面特效
|
2021-08-05 15:09:58 +08:00 |
gaoxin
|
597a747848
|
【公告】公告分包配置参数,PackID将代替SubNoticeID,对外将不再提供SubNoticeID的配置
|
2021-08-05 14:41:19 +08:00 |
gaoxin
|
59afbd6773
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-05 14:39:44 +08:00 |
gaoxin
|
0f5e66cfea
|
【公告】公告显隐改为config文件配置
|
2021-08-05 14:39:39 +08:00 |
ZhangBiao
|
d86921d5a3
|
【降妖夺宝】次数修改提交
|
2021-08-05 14:33:07 +08:00 |
ZhangBiao
|
1c0880abbf
|
【寻宝迷踪】
|
2021-08-05 14:31:31 +08:00 |
ZhangBiao
|
9bd336158d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-04 18:47:09 +08:00 |
ZhangBiao
|
cad9409314
|
【万象商会】upview调整
|
2021-08-04 18:46:59 +08:00 |
zhangqiang
|
1e4b55d9fd
|
【修改协议请求】修改进入游戏会向后的发送更换 称号 皮肤 坐骑 请求
|
2021-08-04 17:53:30 +08:00 |
zhangqiang
|
3cf8a5d2ce
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-04 17:43:11 +08:00 |
zhangqiang
|
abb9873f80
|
【玩家信息】玩家信息面板需要显示神将佩戴宝物的强化等级和精炼等级
|
2021-08-04 17:42:47 +08:00 |
ZhangBiao
|
c85cc55432
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-04 17:24:03 +08:00 |
ZhangBiao
|
50cbd0ea50
|
【灵兽山】增加灵兽界面跳转
|
2021-08-04 16:58:19 +08:00 |
ZhangBiao
|
2ba5a58a3f
|
【紫府神印】增加预览功能
|
2021-08-04 14:55:24 +08:00 |
ZhangBiao
|
3b86f741ee
|
【适配】增加限时兑换按钮特效
|
2021-08-03 18:06:02 +08:00 |
gaoxin
|
51e4e3206c
|
【成就提示】修复心魔快速战斗结算界面,通过成就跳转领取成就奖励后卡死的问题
|
2021-08-03 15:24:49 +08:00 |
jiaoyangna
|
fabd517c04
|
【ID1017608】
【点将台】点击箭头,当切换页面大于2个时,会出现明显未对准后校准状态
|
2021-08-03 12:03:07 +08:00 |
zhangqiang
|
0de6e3f63a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-03 11:00:06 +08:00 |
zhangqiang
|
8ef10cb100
|
【主城小人层级】
|
2021-08-03 10:59:41 +08:00 |
ZhangBiao
|
fef7ea4d0b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-03 10:39:57 +08:00 |
ZhangBiao
|
53dc964596
|
【十绝阵】主界面倒计时超框修改
|
2021-08-03 10:39:40 +08:00 |
zhangqiang
|
3c899d20d5
|
【主城】主城小人层级错误
|
2021-08-03 10:36:55 +08:00 |
ZhangBiao
|
06569c49c2
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-03 10:28:09 +08:00 |
ZhangBiao
|
28b794eea2
|
【寻宝迷踪】开坑
|
2021-08-03 10:27:36 +08:00 |
zhangqiang
|
0ab8247704
|
【跨服排行榜】修改
|
2021-08-03 10:12:54 +08:00 |
gaoxin
|
35b9a89503
|
Merge branch 'gx/充值前校验' into china/dev
|
2021-08-02 19:24:53 +08:00 |
gaoxin
|
2df20e2f91
|
【充值】充值前先请求订单号,并通过透传参数传递给后端
|
2021-08-02 19:24:44 +08:00 |
gaoxin
|
ac62390992
|
Revert "Revert "[战斗]========服务器发送随机种子修改""
This reverts commit 0b827be035 .
|
2021-08-02 19:22:05 +08:00 |
gaoxin
|
0b827be035
|
Revert "[战斗]========服务器发送随机种子修改"
This reverts commit 331621bfd0 .
|
2021-08-02 18:26:33 +08:00 |
gaoxin
|
bd85be16d2
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-02 17:48:34 +08:00 |
gaoxin
|
cd5ee0a6e0
|
【挂机奖励】修复满级后领取挂机奖励会弹出升级提示的问提
|
2021-08-02 17:47:43 +08:00 |
zhangqiang
|
14d50731a8
|
【十绝阵】显示修改 罗浮争锋 适配
|
2021-08-02 17:35:27 +08:00 |
wangzhenxing
|
331621bfd0
|
[战斗]========服务器发送随机种子修改
|
2021-08-02 16:46:54 +08:00 |
gaoxin
|
64077a2e28
|
【跨服聊天】重新分配跨服分组时,清空跨服聊天
|
2021-08-02 16:25:08 +08:00 |
gaoxin
|
54448208df
|
【切磋】战斗界面重复打开容错添加
|
2021-08-02 15:33:50 +08:00 |
wangzhenxing
|
4358ef97e3
|
[bug]====聊天界面称号特效穿透问题修改
|
2021-08-02 14:27:13 +08:00 |
jiaoyangna
|
3c67abbd6d
|
四元阵闪现人物立绘修改
|
2021-08-02 11:04:19 +08:00 |
zhangqiang
|
acf647d9c5
|
【罗浮争锋】
|
2021-07-31 17:20:07 +08:00 |
gaoxin
|
a96b609a49
|
【森罗幻境】修复未开启时红点方法报错
|
2021-07-31 16:49:28 +08:00 |
gaoxin
|
de1d879717
|
【聊天】修改公会和跨服频道的未解锁提示内容
|
2021-07-31 16:25:43 +08:00 |
gaoxin
|
0cd58e9f6d
|
【巅峰赛】未开放状态不可进入
|
2021-07-31 16:10:57 +08:00 |
gaoxin
|
066f603cb1
|
Merge branch 'gx/packID打点' into china/dev
|
2021-07-31 16:03:07 +08:00 |
gaoxin
|
96adf23ab2
|
【http请求】请求报错日志打印优化
|
2021-07-31 16:02:49 +08:00 |
gaoxin
|
1006de499c
|
【巅峰赛】添加未解锁状态显示
|
2021-07-31 15:59:14 +08:00 |
zhangqiang
|
fa203e1dc8
|
【跨服排行】
|
2021-07-30 19:20:53 +08:00 |
zhangqiang
|
c1e192943c
|
【排行榜】踏碎凌霄称号大小修改
|
2021-07-30 18:29:44 +08:00 |
jiaoyangna
|
36e28866ed
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 17:58:59 +08:00 |
jiaoyangna
|
2ecffb1b10
|
宝物培养位置修改
|
2021-07-30 17:58:47 +08:00 |
zhangqiang
|
98649b66c1
|
【跨服排行】
|
2021-07-30 17:52:49 +08:00 |
ZhangBiao
|
92f3ee123c
|
【升星有礼】界面调整
|
2021-07-30 17:51:25 +08:00 |
ZhangBiao
|
5f994f6abc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 16:23:26 +08:00 |
ZhangBiao
|
a40ccb1510
|
【新将来袭、降妖夺宝】增加按钮特效
|
2021-07-30 16:22:59 +08:00 |
wangzhenxing
|
fdfa2dd76b
|
[战斗]============追加额外技能是否触发特性修改,哪吒大招后摇时间延长
|
2021-07-30 16:03:22 +08:00 |
zhangqiang
|
80392134af
|
【跨服排行】红点显示修改
|
2021-07-30 15:57:11 +08:00 |
gaoxin
|
ba35814301
|
【跨服聊天】未在跨服阶段不可进入跨服频道
|
2021-07-30 15:38:57 +08:00 |
zhangqiang
|
c0243afe6c
|
【跨服分组】推送
|
2021-07-30 15:14:52 +08:00 |
jiaoyangna
|
c6c11c9374
|
宝物消耗震动修改
|
2021-07-30 15:11:56 +08:00 |
jiaoyangna
|
83f2a96c34
|
做个容错
|
2021-07-30 14:39:10 +08:00 |
jiaoyangna
|
9266d81377
|
【ID1009852】
四元阵界面优化,修改新手指引的抽卡位置
|
2021-07-30 14:30:10 +08:00 |
jiaoyangna
|
0ed878daac
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 14:17:55 +08:00 |
jiaoyangna
|
aa82fc9f6b
|
震动效果修改
|
2021-07-30 14:17:44 +08:00 |
gaoxin
|
4d8ab5dd7e
|
【跨服聊天】关闭服务器名称显示
|
2021-07-30 14:11:50 +08:00 |
jiaoyangna
|
3c012bb3f4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 14:05:09 +08:00 |
jiaoyangna
|
9ce0dcbf75
|
返回界面装备显示错误修改
|
2021-07-30 14:05:06 +08:00 |
gaoxin
|
aece2194b5
|
【跨服聊天】添加服务器名显示
|
2021-07-30 13:47:03 +08:00 |
zhangqiang
|
78ec831ca1
|
【跨服详情】修改提交
|
2021-07-30 11:59:39 +08:00 |
zhangqiang
|
23d4f9548f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-30 10:21:45 +08:00 |
zhangqiang
|
edbfbc9afc
|
【主城优化】跨服战入口变更位置
|
2021-07-30 10:20:35 +08:00 |
jiaoyangna
|
8c0060a835
|
四元阵动画播两遍修改
|
2021-07-30 10:00:26 +08:00 |
gaoxin
|
f5584b0fbe
|
【巅峰赛】添加未开放状态兼容处理
|
2021-07-29 20:00:02 +08:00 |
jiaoyangna
|
f73a554f35
|
宝物震动修改
|
2021-07-29 18:57:30 +08:00 |
jiaoyangna
|
7af6aa20da
|
宝物引导提交
|
2021-07-29 18:53:00 +08:00 |
jiaoyangna
|
97c5e11f5c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 18:36:45 +08:00 |
jiaoyangna
|
0480506f53
|
【ID1009852】
四元阵界面优化,修改新手指引的抽卡位置
|
2021-07-29 18:36:30 +08:00 |
wangzhenxing
|
31c19def0a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 17:34:55 +08:00 |
wangzhenxing
|
d8801cae6c
|
[称号]=============添加罗浮争锋称号 获得 及 到时 后消息推送
|
2021-07-29 17:34:40 +08:00 |
ZhangBiao
|
3cdce73c69
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 17:12:31 +08:00 |
ZhangBiao
|
bc46019646
|
【战令优化】无尽副本任务数量冗余修改
|
2021-07-29 17:12:21 +08:00 |
zhangqiang
|
8b56e352ba
|
【跨服排行榜】
|
2021-07-29 17:11:10 +08:00 |
zhangqiang
|
c11d9849fd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-07-29 16:38:35 +08:00 |
zhangqiang
|
9c28f232f6
|
【跨服排行榜】
|
2021-07-29 16:35:58 +08:00 |
jiaoyangna
|
283f9d209a
|
魂印圈圈错误修改
|
2021-07-29 16:35:20 +08:00 |
jiaoyangna
|
6f24638e3e
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 16:10:43 +08:00 |
jiaoyangna
|
52e9f406aa
|
十绝阵当我的排名为0 时报错
|
2021-07-29 16:10:39 +08:00 |
wangzhenxing
|
2cafeecb80
|
[战斗]==============死亡技能不受眩晕,沉默影响
|
2021-07-29 15:44:23 +08:00 |
jiaoyangna
|
706ee26390
|
魂印分解界面特效被切修改
|
2021-07-29 15:31:09 +08:00 |
jiaoyangna
|
01632378f6
|
魂印分解界面修改
|
2021-07-29 15:21:44 +08:00 |
jiaoyangna
|
856f03b494
|
【ID1017815】
【魂印分解】一键选择,优先选择了品质高的魂印
|
2021-07-29 15:01:58 +08:00 |
jiaoyangna
|
548e43b486
|
共鸣中去掉一键装备红点
|
2021-07-29 14:33:52 +08:00 |
jiaoyangna
|
2f47e10caf
|
重置提交
|
2021-07-29 14:20:51 +08:00 |
jiaoyangna
|
44965dd1c2
|
跨服十绝阵提交
|
2021-07-29 12:09:03 +08:00 |
jiaoyangna
|
50963966fa
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 11:53:16 +08:00 |
jiaoyangna
|
beacff1d20
|
共鸣中的宝物去掉红点
|
2021-07-29 11:53:11 +08:00 |
gaoxin
|
a61602eae4
|
【角色信息】删除服务器名称只在JUMPSERVER类型下显示的限制
|
2021-07-29 11:50:59 +08:00 |
gaoxin
|
1b3e5c196b
|
【跨服聊天】完善跨服聊天角色信息显示
|
2021-07-29 11:46:59 +08:00 |
gaoxin
|
381d537a4e
|
【登录】除流畅,拥挤和爆满外的其他状态全部不可进入游戏
|
2021-07-29 11:44:35 +08:00 |
jiaoyangna
|
f935fb163b
|
层级修改提交
|
2021-07-29 11:34:53 +08:00 |
jiaoyangna
|
522754669f
|
删除log
|
2021-07-29 11:31:30 +08:00 |
ZhangBiao
|
59c823e080
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 11:19:03 +08:00 |
ZhangBiao
|
68466c0fff
|
【副本界面】按钮调整
|
2021-07-29 11:18:53 +08:00 |
jiaoyangna
|
cfdc6b0abc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 11:13:44 +08:00 |
jiaoyangna
|
63780c4c7a
|
宝物共鸣修改
|
2021-07-29 11:13:34 +08:00 |
zhangqiang
|
1969dd31ab
|
Revert "【跨服切磋】"
This reverts commit cc8974c016 .
|
2021-07-29 11:11:16 +08:00 |
jiaoyangna
|
040cd78dc4
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 10:24:21 +08:00 |
jiaoyangna
|
12c8efa516
|
装备红点提交
|
2021-07-29 10:23:52 +08:00 |
ZhangBiao
|
e1ae3e3bf3
|
【副本界面】按下区域大小调整
|
2021-07-29 10:09:02 +08:00 |
zhangqiang
|
cc8974c016
|
【跨服切磋】
|
2021-07-28 18:38:06 +08:00 |
jiaoyangna
|
f4cc4d7df6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 17:46:11 +08:00 |
jiaoyangna
|
7ee1ef9910
|
Merge branch 'china/dev-c' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity5.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
# Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
|
2021-07-28 17:45:59 +08:00 |
gaoxin
|
e552db5499
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 17:43:04 +08:00 |
gaoxin
|
ef78e0ae21
|
【跨服聊天】添加跨服聊天频道
|
2021-07-28 17:42:58 +08:00 |
jiaoyangna
|
b98fd71d35
|
删除资源工具提交
|
2021-07-28 17:00:14 +08:00 |
jiaoyangna
|
55c839dcd0
|
Revert "Revert "红点修改提交""
This reverts commit d53776b558 .
|
2021-07-28 16:59:07 +08:00 |
jiaoyangna
|
8c01285354
|
Revert "Revert "强化和精炼界面修改""
This reverts commit 4c9871767f .
|
2021-07-28 16:59:00 +08:00 |
jiaoyangna
|
7ac8f03cd3
|
Revert "Revert "宝物培养修改提交""
This reverts commit 4590076eb9 .
|
2021-07-28 16:58:52 +08:00 |
jiaoyangna
|
ab7c586a90
|
Revert "Revert "装备界面改动""
This reverts commit 9a1d361c63 .
|
2021-07-28 16:58:44 +08:00 |
jiaoyangna
|
93a9473184
|
红点修改提交
|
2021-07-28 16:52:41 +08:00 |
ZhangBiao
|
33edb62796
|
【锻器阁】增加魂印合成引导
|
2021-07-28 16:45:29 +08:00 |
wangzhenxing
|
ef714577e8
|
[bug]========称号显示修改
|
2021-07-28 16:10:58 +08:00 |
zhangqiang
|
9a2d9c70a7
|
【新功能】罗浮争锋排行榜增加跨服切磋功能
|
2021-07-28 15:48:35 +08:00 |
jiaoyangna
|
ad850da05f
|
宝物共鸣修改
|
2021-07-28 15:40:50 +08:00 |
ZhangBiao
|
263cb18d03
|
【车迟斗法】玩法内等待次数刷新,红点不显示,退出重进显示正常 修复
|
2021-07-28 15:16:10 +08:00 |
jiaoyangna
|
4805b041e8
|
宝物使用跳转错误修改
|
2021-07-28 15:07:57 +08:00 |
jiaoyangna
|
ab9e5f8e64
|
红点修改提交
|
2021-07-28 14:00:17 +08:00 |
jiaoyangna
|
eea24f126e
|
红点添加
|
2021-07-28 13:49:04 +08:00 |
ZhangBiao
|
2c0c23553c
|
【逍遥游】恭喜获得中道具有跳转按钮,跳转后再返回显示空的恭喜获得
|
2021-07-28 12:06:58 +08:00 |
jiaoyangna
|
1123d9dc2d
|
宝物修改提交
|
2021-07-28 11:52:47 +08:00 |
ZhangBiao
|
48330717a7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 11:20:36 +08:00 |
ZhangBiao
|
ffd0685d97
|
【任务跳转】未解锁灵兽山,灵兽招募任务前往提示活动未开启,应提示功能未解锁
【红点】车迟斗法的红点仍绑在副本入口处,而非公会按钮
|
2021-07-28 11:20:27 +08:00 |
jiaoyangna
|
b0c50a4571
|
id1017799
(cherry picked from commit 35a048adc9 )
|
2021-07-28 11:07:16 +08:00 |
jiaoyangna
|
35a048adc9
|
id1017799
|
2021-07-28 11:06:33 +08:00 |
jiaoyangna
|
527295f30c
|
宝物优化
|
2021-07-28 10:51:39 +08:00 |
zhangqiang
|
e54a17decb
|
【魂印穿戴】点击魂印不穿戴,魂印在列表中消失
|
2021-07-28 10:51:35 +08:00 |
ZhangBiao
|
c8d35b5458
|
【星魂福袋】点击使用数量加号,提示英雄达上限 修复
|
2021-07-28 09:58:41 +08:00 |
jiaoyangna
|
88df4dbde8
|
为装备的宝物点击报错修改提交
|
2021-07-28 09:48:08 +08:00 |
jiaoyangna
|
d1845618d1
|
宝物可强化时,TIPS上的【强化】按钮未显示红点,精炼功能有相同问题
|
2021-07-27 18:53:36 +08:00 |
jiaoyangna
|
94c92a7f22
|
拥有可替换/战斗力较高的宝物时,应在宝物图标右上角,及下方的魂宝/灵宝按钮上显示红点,不应当在魂宝/灵宝装备格子上显示红点
|
2021-07-27 18:34:37 +08:00 |
jiaoyangna
|
d4126bb634
|
宝物培养修改
|
2021-07-27 14:39:48 +08:00 |
jiaoyangna
|
7225723b34
|
引导修改提交
|
2021-07-27 10:25:42 +08:00 |
gaoxin
|
d4e78afcab
|
【packID】数数打点新增字段
|
2021-07-27 10:04:22 +08:00 |
ZhangBiao
|
509f34e19b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-26 19:00:55 +08:00 |
ZhangBiao
|
74c713c65b
|
【主题活动】加强限时商市,珍奇宝阁入口按钮的辨识度
|
2021-07-26 19:00:41 +08:00 |
jiaoyangna
|
917662ff20
|
宝物培养红点提交
|
2021-07-26 17:16:29 +08:00 |
jiaoyangna
|
efc0f62cc5
|
【ID1017708】
【无尽副本】购买秘宝后等待下一期秘宝刷新,上一期购买秘宝获得的积分不清,导致下期秘宝无法正常领取奖励
(cherry picked from commit 76fad397de )
|
2021-07-26 16:06:21 +08:00 |
jiaoyangna
|
825c38fc0d
|
红点修改提交
(cherry picked from commit c546710d1f )
|
2021-07-26 15:19:57 +08:00 |
jiaoyangna
|
c546710d1f
|
红点修改提交
|
2021-07-26 15:18:49 +08:00 |
ZhangBiao
|
07de90eb45
|
【提交】
|
2021-07-26 15:07:49 +08:00 |
ZhangBiao
|
da34a5834b
|
【主题活动】时间显示调整
|
2021-07-26 14:36:58 +08:00 |
ZhangBiao
|
1ba38242ad
|
【主题活动】提交
|
2021-07-26 12:29:13 +08:00 |
zhangqiang
|
71f7e8a469
|
Merge branch 'china/dev' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-07-27 11:26:30 +08:00 |
gaoxin
|
3e11938166
|
【meta】
|
2021-07-27 10:06:56 +08:00 |
jiaoyangna
|
76fad397de
|
【ID1017708】
【无尽副本】购买秘宝后等待下一期秘宝刷新,上一期购买秘宝获得的积分不清,导致下期秘宝无法正常领取奖励
|
2021-07-26 11:23:26 +08:00 |
JieLing
|
d2090cb930
|
【跨服】修复角色信息英雄详细信息报错
|
2021-07-26 11:10:11 +08:00 |
ZhangBiao
|
11543e53a0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-26 11:09:20 +08:00 |
ZhangBiao
|
beea770b78
|
【竞技场】适配调整
|
2021-07-26 11:09:07 +08:00 |
zhangqiang
|
e01694fa28
|
【跨服天梯】战斗记录协议修改
|
2021-07-26 11:03:45 +08:00 |
jiaoyangna
|
9a1d361c63
|
Revert "装备界面改动"
This reverts commit c131d41d58 .
|
2021-07-26 10:03:10 +08:00 |
jiaoyangna
|
4590076eb9
|
Revert "宝物培养修改提交"
This reverts commit bcd0651029 .
|
2021-07-26 10:00:59 +08:00 |
jiaoyangna
|
4c9871767f
|
Revert "强化和精炼界面修改"
This reverts commit 9d78af51e0 .
|
2021-07-26 10:00:49 +08:00 |
jiaoyangna
|
d53776b558
|
Revert "红点修改提交"
This reverts commit 734efe7b52 .
|
2021-07-26 10:00:07 +08:00 |
jiaoyangna
|
c93f98dabc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-26 09:55:42 +08:00 |
ZhangBiao
|
1634345c1e
|
【清除log】
|
2021-07-26 09:48:18 +08:00 |
jiaoyangna
|
b49166afe1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-24 19:39:25 +08:00 |
jiaoyangna
|
734efe7b52
|
红点修改提交
|
2021-07-24 19:36:34 +08:00 |
ZhangBiao
|
7111f53936
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-24 19:34:13 +08:00 |
ZhangBiao
|
7e9fad28b7
|
【万象商会】提交
|
2021-07-24 19:33:56 +08:00 |
jiaoyangna
|
06dfb74d33
|
活动修改提交
|
2021-07-24 19:33:54 +08:00 |
jiaoyangna
|
e5d387c37d
|
主题活动任务修改提交
|
2021-07-24 19:07:56 +08:00 |
jiaoyangna
|
7b9a5e535c
|
红点检测修改提交
|
2021-07-24 18:16:05 +08:00 |
jiaoyangna
|
8d76903f10
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-24 18:13:45 +08:00 |
jiaoyangna
|
8226901eb8
|
任务修改提交
|
2021-07-24 18:13:40 +08:00 |
ZhangBiao
|
5bba13ccc0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-24 17:46:03 +08:00 |
ZhangBiao
|
9a7ef2f0a2
|
【轩辕宝境】从任意一个宝境里返回轩辕宝境主界面,顶部资源条消失
|
2021-07-24 17:45:48 +08:00 |
jiaoyangna
|
1e70bdb2ca
|
活动修改提交
|
2021-07-24 17:38:48 +08:00 |
jiaoyangna
|
9d78af51e0
|
强化和精炼界面修改
|
2021-07-24 16:22:16 +08:00 |
jiaoyangna
|
24363d5c03
|
【ID1009862】
15日登录送白泽活动加入预告功能
|
2021-07-24 15:46:00 +08:00 |
jiaoyangna
|
6c59983568
|
工会查看信息报错修改
|
2021-07-24 15:18:38 +08:00 |
ZhangBiao
|
7bc3a3d460
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 19:23:05 +08:00 |
ZhangBiao
|
c3a5e5b7de
|
【主题活动】bannerSetNative
|
2021-07-23 19:22:56 +08:00 |
jiaoyangna
|
fd7d51168d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 19:12:46 +08:00 |
jiaoyangna
|
bcd0651029
|
宝物培养修改提交
|
2021-07-23 19:12:42 +08:00 |
ZhangBiao
|
38bbb808b4
|
【主题活动】商店
|
2021-07-23 19:05:53 +08:00 |
wangzhenxing
|
ff6639ebfb
|
【称号】=====称号属性显示修改
|
2021-07-23 18:34:07 +08:00 |
zhangqiang
|
3d13fbca6d
|
【拍脸修改】回退
|
2021-07-23 17:51:22 +08:00 |
ZhangBiao
|
8a90b87942
|
【新副本界面】心魔次数文字错误修改,和弹窗修改
|
2021-07-23 17:43:30 +08:00 |
ZhangBiao
|
627954ae3f
|
【大闹天宫】层数错误提交
|
2021-07-23 17:26:24 +08:00 |
ZhangBiao
|
2dc965137b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 17:15:15 +08:00 |
ZhangBiao
|
93469872a7
|
【主题活动】提交
|
2021-07-23 17:15:04 +08:00 |
zhangqiang
|
beb91b9407
|
【拍脸报错】
|
2021-07-23 16:43:51 +08:00 |
wangzhenxing
|
3dc2970f1f
|
[功能]============15日登陆预告预设修改,整点自动刷新
|
2021-07-23 16:27:33 +08:00 |
ZhangBiao
|
bd5b473246
|
【大闹天宫】增加层数显示
|
2021-07-23 15:55:49 +08:00 |
ZhangBiao
|
31e8aa5d00
|
【山河社稷图】关闭关卡界面入口
|
2021-07-23 15:22:51 +08:00 |
ZhangBiao
|
3eee03aca7
|
【新副本界面】等级提示错误修复
|
2021-07-23 14:55:33 +08:00 |
wangzhenxing
|
79a1a5acc0
|
[功能]============称号显示修改
|
2021-07-23 14:15:53 +08:00 |
ZhangBiao
|
dc4fbe89e5
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 14:11:50 +08:00 |
ZhangBiao
|
b5fd7ba8f6
|
【新副本界面】刷新时间和引导修改
|
2021-07-23 14:11:29 +08:00 |
jiaoyangna
|
92738c45a7
|
超值基金红点修改
|
2021-07-23 13:48:07 +08:00 |
jiaoyangna
|
ffeacc6bf0
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 13:45:43 +08:00 |
jiaoyangna
|
4af32b0a85
|
超值基金红点修改提交
|
2021-07-23 13:45:40 +08:00 |
zhangqiang
|
731715ed35
|
【功能引导】幸运探宝开启,界面不会自动切换到幸运探宝入口
|
2021-07-23 13:43:34 +08:00 |
DESKTOP-98AVA47\Administrator
|
ce89a20050
|
活动时间修改
|
2021-07-23 11:47:15 +08:00 |
DESKTOP-98AVA47\Administrator
|
7703a9e740
|
红点修改提交
|
2021-07-23 11:45:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
022681face
|
红点修改提交
|
2021-07-23 11:36:44 +08:00 |
ZhangBiao
|
2164685f0c
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 11:27:38 +08:00 |
ZhangBiao
|
8981c707ba
|
【主题活动】分页提交
|
2021-07-23 11:27:28 +08:00 |
wangzhenxing
|
02cea65055
|
[称号]====跨服称号资源提交
|
2021-07-23 11:20:05 +08:00 |
DESKTOP-98AVA47\Administrator
|
6986b0d3a1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 11:17:53 +08:00 |
DESKTOP-98AVA47\Administrator
|
6f8cb042bb
|
报错修改提交
|
2021-07-23 11:17:50 +08:00 |
wangzhenxing
|
d0d533cecc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 11:08:03 +08:00 |
wangzhenxing
|
f7029c2ef0
|
[功能]==============15日登陆添加 预告
|
2021-07-23 11:07:46 +08:00 |
zhangqiang
|
350f13371a
|
【逍遥游】掉落问题修改
|
2021-07-23 10:58:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
01f9ec621d
|
【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
|
2021-07-22 20:25:32 +08:00 |
DESKTOP-98AVA47\Administrator
|
875325fabb
|
【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
|
2021-07-22 20:03:03 +08:00 |
DESKTOP-98AVA47\Administrator
|
25aed04450
|
报错修改
|
2021-07-22 19:55:19 +08:00 |
DESKTOP-98AVA47\Administrator
|
f676618e42
|
【ID1009871】
【点将台】调整神将召唤、友情召唤和普通召唤的顺序
|
2021-07-22 19:50:38 +08:00 |
gaoxin
|
0db39ccbe3
|
Merge branch 'china/ios' into china/dev
# Conflicts:
# Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
|
2021-07-22 19:39:14 +08:00 |
gaoxin
|
a16d134d2d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 19:37:13 +08:00 |
gaoxin
|
a228c18c50
|
【MapPlayerView】随机使用lua原生的方法
|
2021-07-22 19:36:17 +08:00 |
gaoxin
|
9d7a51fd57
|
【容错】登录容错添加,服务器发送不存在的活动时,不再卡死
|
2021-07-22 19:35:22 +08:00 |
zhangqiang
|
c3b68ef28a
|
【跨服】修改跨服排行未解锁提示文字
|
2021-07-22 19:30:53 +08:00 |
zhangqiang
|
1cf142c82b
|
【跨服天梯】国内提交+1
|
2021-07-22 19:01:46 +08:00 |
ZhangBiao
|
1e822443f9
|
Merge branch '0优化/副本界面' into china/dev
|
2021-07-22 18:19:42 +08:00 |
ZhangBiao
|
b0d10a29d2
|
【公会】公会按钮位置调整
|
2021-07-22 17:41:01 +08:00 |
luyao
|
5555f33715
|
玲珑宝镜音效修改提交
|
2021-07-22 17:25:17 +08:00 |
ZhangBiao
|
056d3dc094
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 17:01:32 +08:00 |
DESKTOP-98AVA47\Administrator
|
1c75527f36
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-22 16:41:13 +08:00 |
DESKTOP-98AVA47\Administrator
|
2424a8090b
|
添加玲珑宝镜音效
|
2021-07-22 16:40:53 +08:00 |
jiaoyangna
|
7959f803c4
|
取消注释
|
2021-07-22 16:15:47 +08:00 |
jiaoyangna
|
b0f868485e
|
无尽秘宝推送
|
2021-07-22 16:05:58 +08:00 |
ZhangBiao
|
db258d27cb
|
【副本界面】调整
|
2021-07-22 15:13:24 +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
|
b7d7b3270a
|
【主题活动】分页处理
|
2021-07-22 10:36:35 +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 |
ZhangBiao
|
b0e53312e7
|
【心愿抽卡】增加英雄加入卡池的天数条件
|
2021-07-21 17:35:38 +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 |
jiaoyangna
|
4442b9c38b
|
【ID1017598】
【灵兽白泽活动】点击查看红色装备TIPS后,切换至灵兽白泽互动点击金色装备,弹出的装备TIPS中会多出套装属性
|
2021-07-21 16:54:38 +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 |
jiaoyangna
|
740592309d
|
【ID1017508】
【点将台】道具足够10连抽时,10连按钮没有红点
|
2021-07-21 11:22:56 +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 |
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 |
zhangqiang
|
fbc490737b
|
【公会】在公会界面散会,黑屏
|
2021-07-20 11:09:43 +08:00 |
DESKTOP-98AVA47\Administrator
|
625afbec42
|
四元阵修改提交
|
2021-07-20 10:27:43 +08:00 |
DESKTOP-98AVA47\Administrator
|
f6ecf740b7
|
抽卡选中按钮修改
|
2021-07-20 10:24:33 +08:00 |
DESKTOP-98AVA47\Administrator
|
8168d284f0
|
跳转提交
|
2021-07-20 10:20:41 +08:00 |
DESKTOP-98AVA47\Administrator
|
3673a84edf
|
点将台乱点错误修改
|
2021-07-20 10:08:06 +08:00 |
DESKTOP-98AVA47\Administrator
|
2f9a357023
|
跳转修改提交
|
2021-07-19 21:58:45 +08:00 |
DESKTOP-98AVA47\Administrator
|
ee84f39794
|
四元阵 报错修改
|
2021-07-19 21:35:11 +08:00 |
ZhangBiao
|
effe3bdfa1
|
【十绝阵】跨天状态刷新
|
2021-07-19 17:30:17 +08:00 |
ZhangBiao
|
d19d2f7dd3
|
【优化】心愿抽卡将孙悟空从心愿池去除
|
2021-07-19 15:50:35 +08:00 |