zhangqiang
|
1c95b576f0
|
Merge branch '0功能/鸿蒙门阵' into 0功能/本周版本优化内容
# Conflicts:
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
|
2021-02-19 10:54:36 +08:00 |
zhangqiang
|
02504b0020
|
【限时兑换跳转】修复
|
2021-01-28 20:12:40 +08:00 |
zhangqiang
|
ba6db73270
|
【NPC】去重
|
2021-01-28 15:27:37 +08:00 |
zhangqiang
|
a0a2ac324a
|
【NPC】优化
|
2021-01-28 14:48:57 +08:00 |
zhangqiang
|
6f03f8cc9d
|
【抽卡动画 NPC】 提交
|
2021-01-28 11:55:26 +08:00 |
zhangqiang
|
ad451253cb
|
【优化】主城假人改为NPC或者排行榜角色 3
|
2021-01-27 18:20:50 +08:00 |
zhangqiang
|
122ccb94e2
|
【优化】主城假人改为NPC或者排行榜角色 2
|
2021-01-27 17:36:33 +08:00 |
zhangqiang
|
7b01f5fc07
|
【优化】主城假人改为NPC或者排行榜角色
|
2021-01-27 16:40:17 +08:00 |
guowei
|
5a11596515
|
【鸿蒙阵修改】
|
2021-01-18 17:43:11 +08:00 |
guowei
|
344ec52500
|
【巅峰赛头像修改】
|
2021-01-18 15:07:23 +08:00 |
DESKTOP-98AVA47\Administrator
|
c57a5ec8eb
|
【巅峰赛头像框修改】
|
2021-01-18 10:33:32 +08:00 |
DESKTOP-98AVA47\Administrator
|
040971534e
|
【巅峰赛限时头像修改】
|
2021-01-15 21:06:48 +08:00 |
guowei
|
3f8312953e
|
Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
|
2021-01-14 10:20:12 +08:00 |
ZhangBiao
|
a75d553a6a
|
【无尽副本】世界等级显示1级 修改
|
2021-01-13 11:04:28 +08:00 |
DESKTOP-98AVA47\Administrator
|
e3ffcb23b8
|
【(送神祠)选择属性筛选后进行恭送神将、神将归元、法宝归元、宝物分解优化】
|
2021-01-08 19:16:22 +08:00 |
ZhangBiao
|
d09bc60b5e
|
【森罗幻境】红点刷新修改
|
2021-01-08 19:08:04 +08:00 |
guowei
|
6c191263bd
|
Merge branch 'master_xma_local' into 0功能/鸿蒙门阵
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
# Assets/ManagedResources/~Lua/Message/CommonProto.proto
# Assets/ManagedResources/~Lua/Message/Expedition.proto
# Assets/ManagedResources/~Lua/Message/Family.proto
# Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
# Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
# Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua
|
2021-01-06 20:05:35 +08:00 |
ZhangBiao
|
31c5aa7580
|
【森罗幻境】红点刷新修改
|
2021-01-06 17:30:48 +08:00 |
DESKTOP-98AVA47\Administrator
|
238c0706c0
|
【(送神祠)选择属性筛选后进行恭送神将、神将归元、法宝归元、宝物分解优化】
|
2021-01-05 14:29:33 +08:00 |
guowei
|
8a3eb5aab8
|
【鸿蒙阵成就补充】
|
2021-01-05 14:26:26 +08:00 |
guowei
|
4d951b38bd
|
【鸿蒙阵成就】
|
2021-01-05 10:46:35 +08:00 |
guowei
|
94f549f605
|
【鸿蒙阵成就 任务】
|
2021-01-04 19:40:39 +08:00 |
JieLing
|
b995971610
|
【森罗】跳转
|
2021-01-04 18:29:20 +08:00 |
gaoxin
|
bf6fd2d13d
|
Merge remote-tracking branch 'origin/0活动开发聚集地/新将活动3个' into master_xma_local
# Conflicts:
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2020-12-26 20:22:23 +08:00 |
ZhangBiao
|
c5022043fd
|
【道具使用跳转】跳转后返回关闭弹窗界面
(cherry picked from commit 150ec3eb2f)
|
2020-12-24 16:43:37 +08:00 |
ZhangBiao
|
4faa39ab2a
|
【道具使用跳转】使用跳转修改,活动道具要大于10000
(cherry picked from commit b2f8d14470)
|
2020-12-24 16:42:24 +08:00 |
jiaoyangna
|
1f05f5f8f6
|
逍遥游 红点提交
|
2020-12-24 16:19:46 +08:00 |
jiaoyangna
|
3a6e07bf1c
|
【逍遥游优化】逍遥游玩法优化内容
|
2020-12-23 20:18:43 +08:00 |
ZhangBiao
|
d0b94a1c3b
|
【新将活动】新将来袭、新疆招募、升星有礼 提交
|
2020-12-23 14:36:15 +08:00 |
ZhangBiao
|
6fc63af086
|
【增加跳转】增加跳转id
|
2020-12-23 11:31:58 +08:00 |
ZhangBiao
|
12760d7cb1
|
【升星有礼】完成
|
2020-12-21 15:41:31 +08:00 |
guowei
|
4f4542d53a
|
【鸿蒙阵】
|
2020-12-18 13:39:35 +08:00 |
ZhangBiao
|
8df6de20e5
|
【副本】isInMap字段删除bug修复
|
2020-11-16 15:24:09 +08:00 |
ZhangBiao
|
a5c36cf58a
|
【灵兽宝阁】未开启更换灵兽版本
|
2020-11-12 17:11:18 +08:00 |
gaoxin
|
23717d6fc9
|
【特权】修复获取特权次数会小于0的问题,解决急速探索会出现剩余次数为负数的问题
|
2020-11-03 15:34:12 +08:00 |
gaoxin
|
54f1660bc2
|
【好友切磋】修复战斗结果显示错误的问题
|
2020-11-02 19:17:19 +08:00 |
zhangqiang
|
3479bd153c
|
【灵兽系统】 合并 功能ok 但是战斗合完进不去
|
2020-10-31 17:01:46 +08:00 |
ZhangBiao
|
0bf6e05add
|
【社稷大典】提交6
|
2020-10-24 18:58:07 +08:00 |
gaoxin
|
f57b10696f
|
【逍遥游】云游值自动恢复修改
|
2020-10-20 00:29:09 +08:00 |
gaoxin
|
d9434f425d
|
修复部分奖励不刷新的问题
|
2020-10-20 00:28:41 +08:00 |
yuanshuai
|
a3c461aff9
|
云游值恢复问题修改
|
2020-10-20 00:28:09 +08:00 |
gaoxin
|
f53a566ce8
|
【逍遥游】功能入口随功能开启添加
|
2020-10-19 22:57:02 +08:00 |
yuanshuai
|
131d1aab1b
|
【逍遥游】红点和帮助弹窗提交
|
2020-10-19 21:39:48 +08:00 |
gaoxin
|
364c9c99fc
|
【逍遥游】功能合并到local分支
|
2020-10-19 20:37:53 +08:00 |
gaoxin
|
05780afedb
|
【自动恢复物品】物品恢复机制改为前端计算
|
2020-10-19 18:37:59 +08:00 |
jiaoyangna
|
f35bad0ee2
|
神州令跳转修改
|
2020-10-15 21:36:16 +08:00 |
zhangqiang
|
f2d3f045aa
|
森罗幻境提交1
|
2020-10-12 14:46:05 +08:00 |
jiaoyangna
|
0c91a81329
|
【跳转】碧海卷使用按钮跳转位置不正确
|
2020-10-15 16:05:53 +08:00 |
liujiaqi
|
783c61eed8
|
修复新玩家登陆卡在登陆100%
|
2020-09-27 20:40:20 +08:00 |
jiaoyangna
|
6a764f569e
|
跳转限时兑换修改
|
2020-09-27 16:21:42 +08:00 |