jiaoyangna
|
41977a85f5
|
【优化】删除十绝阵敌方阵容上的血条和怒气条
|
2020-12-23 14:52:13 +08:00 |
ZhangBiao
|
d0b94a1c3b
|
【新将活动】新将来袭、新疆招募、升星有礼 提交
|
2020-12-23 14:36:15 +08:00 |
zhangqiang
|
47397d8b06
|
【优化】优化编队界面,现在拖动下阵/换位的操作不流畅,经常失败
|
2020-12-23 14:32:59 +08:00 |
ZhangBiao
|
02fe110563
|
【社稷大典】公会检查跳转失败修复
(cherry picked from commit 6d5a9f9f42 )
|
2020-12-23 11:38:00 +08:00 |
ZhangBiao
|
6fc63af086
|
【增加跳转】增加跳转id
|
2020-12-23 11:31:58 +08:00 |
ZhangBiao
|
38a1eeee9a
|
Merge branch '0活动开发聚集地/升星有礼' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-23 11:29:12 +08:00 |
ZhangBiao
|
239dc826df
|
【升星有礼】合并分支资源名修改
|
2020-12-23 11:22:44 +08:00 |
ZhangBiao
|
e40364082c
|
Merge branch '0活动开发聚集地/降妖夺宝' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
|
2020-12-23 11:21:27 +08:00 |
ZhangBiao
|
9e7f7454e8
|
【降妖夺宝】合并分支资源名修改
|
2020-12-23 11:15:54 +08:00 |
ZhangBiao
|
30f8049ef5
|
Merge branch '0活动开发聚集地/新将来袭' into 0活动开发聚集地/新将活动3个
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
# Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2020-12-23 11:13:48 +08:00 |
ZhangBiao
|
f7f0d4099f
|
【降妖夺宝】结束
|
2020-12-23 10:34:47 +08:00 |
guowei
|
fcb2e4604a
|
【优化】提交
|
2020-12-23 10:10:48 +08:00 |
guowei
|
54deb133e4
|
【更新】
|
2020-12-22 20:12:38 +08:00 |
guowei
|
4e0da5c05d
|
【鸿蒙阵遗漏内容】
|
2020-12-22 19:56:37 +08:00 |
guowei
|
49af5efcdb
|
【合成内容优化】
|
2020-12-22 19:55:39 +08:00 |
guowei
|
e6963e85d9
|
【鸿蒙阵新版】
|
2020-12-22 19:27:49 +08:00 |
guowei
|
0dd211f896
|
【鸿蒙阵】更新
|
2020-12-22 15:41:45 +08:00 |
zhangqiang
|
bb140eab60
|
【鸿蒙阵】 资源漏提
|
2020-12-22 11:33:25 +08:00 |
JieLing
|
a03cd232ee
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-12-22 11:17:42 +08:00 |
guowei
|
8a0574cb6a
|
【鸿蒙阵】
|
2020-12-22 11:06:23 +08:00 |
zhangqiang
|
4db72018cb
|
【鸿蒙阵】 提示变更
|
2020-12-22 09:52:40 +08:00 |
gaoxin
|
a0f059ca9b
|
【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误
|
2020-12-21 18:45:58 +08:00 |
DESKTOP-98AVA47\Administrator
|
b11cf4dfe3
|
【巅峰赛】拍脸修改 有表 张强提交
|
2020-12-24 21:04:33 +08:00 |
gaoxin
|
f26796653d
|
【皮肤】修复未解锁皮肤,拖动不切换回到默认位置时显示错误
|
2020-12-21 18:45:03 +08:00 |
guowei
|
ef02f1b6e9
|
【鸿蒙阵更新】
|
2020-12-21 18:19:38 +08:00 |
ZhangBiao
|
8d245aab44
|
【降妖夺宝】开坑
|
2020-12-21 17:13:05 +08:00 |
gaoxin
|
03e3d77bb6
|
【优化】橙色改为金色
|
2020-12-21 16:15:17 +08:00 |
ZhangBiao
|
12760d7cb1
|
【升星有礼】完成
|
2020-12-21 15:41:31 +08:00 |
guowei
|
314665aa2d
|
【鸿蒙阵修改】
|
2020-12-21 15:10:23 +08:00 |
ZhangBiao
|
3262a6203c
|
【社稷大典】连续捐献-1修复
(cherry picked from commit 1d5551eee7 )
|
2020-12-21 14:19:41 +08:00 |
guowei
|
0454746498
|
【鸿蒙阵】
|
2020-12-21 10:08:30 +08:00 |
JieLing
|
a9543de95d
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-12-18 20:11:43 +08:00 |
JieLing
|
fa24af770b
|
【协议】战斗协议添加id字段
|
2020-12-18 19:38:18 +08:00 |
JieLing
|
e8aa2751a9
|
Merge branch 'master_xma_local' into master_xma_test
|
2020-12-18 19:33:25 +08:00 |
zhangqiang
|
4b49661f24
|
【鸿蒙阵】修改
|
2020-12-18 18:25:38 +08:00 |
gaoxin
|
79f6090afb
|
【协议】回滚系统消息item字段类型
|
2020-12-18 18:22:52 +08:00 |
gaoxin
|
eeb7ecba91
|
【资源】资源名重复修改
|
2020-12-18 18:01:08 +08:00 |
guowei
|
f84e97f531
|
【鸿蒙阵选人界面】
|
2020-12-18 17:41:33 +08:00 |
guowei
|
2a1546b7a4
|
Merge branch '0功能/鸿蒙门阵' of http://60.1.1.230/gaoxin/JL_Client into 0功能/鸿蒙门阵
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab
|
2020-12-18 17:28:22 +08:00 |
guowei
|
d7414a03bd
|
【鸿蒙阵选人界面】
|
2020-12-18 17:24:03 +08:00 |
gaoxin
|
ec47ec2b1c
|
【战报系统】接口uid改为通过战斗id获取,兼容pve战斗数据
|
2020-12-18 16:51:28 +08:00 |
gaoxin
|
ef1ced3ef7
|
【战报系统】基础功能添加
|
2020-12-18 16:51:13 +08:00 |
zhangqiang
|
00980feb57
|
Merge branch '0功能/鸿蒙门阵' of http://60.1.1.230/gaoxin/JL_Client into 0功能/鸿蒙门阵
|
2020-12-18 16:38:03 +08:00 |
zhangqiang
|
e09ed9fdfc
|
【鸿蒙阵】 限制
|
2020-12-18 16:37:56 +08:00 |
guowei
|
f744e609a1
|
【鸿蒙阵剩余图片】
|
2020-12-18 16:31:28 +08:00 |
ZhangBiao
|
72f2dd0e90
|
【主题活动】删除多余的预设
|
2020-12-18 14:05:17 +08:00 |
guowei
|
8438bb9de6
|
【补充 鸿蒙阵贴图】
|
2020-12-18 13:40:59 +08:00 |
guowei
|
4f4542d53a
|
【鸿蒙阵】
|
2020-12-18 13:39:35 +08:00 |
ZhangBiao
|
0692fbf799
|
【森罗幻境】重置事件点不触发修复
(cherry picked from commit c50ba93285 )
|
2020-12-18 12:02:42 +08:00 |
ZhangBiao
|
1431423c4f
|
【森罗幻境】移动过程中打开其他界面问题修复
|
2020-12-18 11:39:01 +08:00 |