xiejun
|
9f8a65e453
|
核心标记
|
2024-01-05 18:14:42 +08:00 |
wangzhenxing
|
86782b5253
|
主城推送礼包修改,挂机界面地方大小修改
|
2023-12-29 20:22:31 +08:00 |
xiejun
|
879a49823f
|
mapconfig
|
2023-12-29 18:40:13 +08:00 |
xiejun
|
4f8f3955ce
|
关卡动态页面和巅峰赛竞技场
|
2023-12-22 15:36:03 +08:00 |
wangzhenxing
|
c3334a5d98
|
更换名称
|
2023-12-07 01:11:27 +08:00 |
yuanshuai
|
7acb7c8f44
|
关卡挂机游戏提交
|
2022-11-22 18:19:37 +08:00 |
wangzhenxing
|
98681509b2
|
【森罗】=====扫荡红点
|
2022-08-24 14:16:01 +08:00 |
wangzhenxing
|
1ae0e604e0
|
[森罗幻境]=====扫荡修改
|
2022-08-24 13:49:55 +08:00 |
wangzhenxing
|
a32c76c9a0
|
[神罗环境]=======无法重复扫荡
|
2022-08-18 16:32:06 +08:00 |
wangzhenxing
|
769bfe3a99
|
[森罗幻境]=====扫荡按钮显示
|
2022-08-18 15:16:56 +08:00 |
wangzhenxing
|
bf31576d31
|
[森罗幻境]====一键扫荡按钮限时隐藏
|
2022-08-18 11:27:36 +08:00 |
wangzhenxing
|
9f0ffb5bb8
|
[森罗幻境]=====退出清除地图资源
|
2022-08-17 15:05:21 +08:00 |
wangzhenxing
|
9c144af11c
|
[森罗幻境]=====添加扫荡
|
2022-08-17 14:23:45 +08:00 |
wangzhenxing
|
16d6e211a3
|
神印四灵显示修改
|
2022-04-27 17:14:20 +08:00 |
wangzhenxing
|
e9219317e2
|
【bug】=====森罗幻境修改
|
2022-04-01 16:01:36 +08:00 |
wangzhenxing
|
6d7dcce74f
|
[bug]======无尽副本编对界面修改
|
2022-03-31 16:00:27 +08:00 |
wangzhenxing
|
a13dd2939a
|
[功能]================神系英雄添加提叫
|
2022-03-28 18:18:19 +08:00 |
gaoxin
|
30e7ef5bd5
|
【无尽副本】加入神将版本控制判断
|
2022-02-22 14:20:02 +08:00 |
gaoxin
|
096d0d0dc4
|
【无尽副本】编队列表加入神将版本判断
|
2022-03-02 13:42:48 +08:00 |
wangzhenxing
|
ef0a0ff436
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2022-01-15 12:47:22 +08:00 |
wangzhenxing
|
853fde91b2
|
[飞升]============飞升修改提交
|
2022-01-15 12:26:12 +08:00 |
wangzhenxing
|
ff7b7ba5ed
|
[飞升]=====bug修改提交
|
2022-01-12 16:41:51 +08:00 |
jiaoyangna
|
bde65d0ecf
|
森罗幻境累计奖励修改提交
|
2022-01-12 13:49:16 +08:00 |
wangzhenxing
|
1b39fbdbe9
|
【飞升】===========神魂后星级显示修改
|
2022-01-10 15:11:30 +08:00 |
wangzhenxing
|
5b670023ed
|
[飞升]=======飞升代码逻辑提交
|
2022-01-05 18:17:44 +08:00 |
jiaoyangna
|
57b0689de6
|
【ID1010911】
【森罗优化】退出森罗幻境时弹出累积收益
|
2021-12-30 18:06:36 +08:00 |
wangzhenxing
|
0cef7683ba
|
[战斗]======效果137修改 立绘朝向修改
|
2021-11-29 17:53:17 +08:00 |
gaoxin
|
878e8b095a
|
【森罗幻境】修复老虎机小游戏后音效播放错误
|
2021-11-26 10:29:12 +08:00 |
gaoxin
|
ad3ca2e0d2
|
【战斗】新增轩辕宝镜,僧罗幻境战斗类型,四灵试炼回放改为回放类型
|
2021-11-26 10:19:29 +08:00 |
jiaoyangna
|
419a9cedc9
|
森罗幻境神将修改
|
2021-11-08 16:31:34 +08:00 |
gaoxin
|
fc38e204ce
|
【森罗幻境】森罗幻境神魂特效穿透
|
2021-11-08 15:04:36 +08:00 |
jiaoyangna
|
ad3b903209
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 16:20:01 +08:00 |
jiaoyangna
|
2179a76560
|
森罗幻境,公会星星修改提交
|
2021-11-05 16:19:47 +08:00 |
ZhangBiao
|
ea4661b254
|
【无尽副本】修改
|
2021-11-05 15:50:49 +08:00 |
jiaoyangna
|
d0d93e02ea
|
代码星星层级设置修改
|
2021-11-05 13:18:55 +08:00 |
ZhangBiao
|
cd8f61cbed
|
【无尽副本】行动力不减修复
|
2021-11-05 10:04:32 +08:00 |
jiaoyangna
|
125e37fe6d
|
神魂提交
|
2021-11-03 10:13:44 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
jiaoyangna
|
33acb35f82
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-09-28 09:52:22 +08:00 |
gaoxin
|
34ade2489d
|
【无尽副本】修复报错
|
2021-09-27 15:35:48 +08:00 |
gaoxin
|
6c50cdfd09
|
【无尽副本】修复无尽副本编队没有人得问题
|
2021-09-27 14:57:27 +08:00 |
jiaoyangna
|
1152586ff1
|
好感度提交
|
2021-09-26 09:54:58 +08:00 |
jiaoyangna
|
003583db7b
|
无尽副本报错修改
|
2021-09-24 14:19:50 +08:00 |
gaoxin
|
34f3f42a04
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua
|
2021-09-22 15:36:10 +08:00 |
wangzhenxing
|
a7f0c42cae
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
Assets/ManagedResources/~Lua/View/UpView.lua
|
2021-09-18 11:52:01 +08:00 |
gaoxin
|
feae377b4f
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
|
2021-09-17 15:25:56 +08:00 |
gaoxin
|
a7ce05450b
|
【战斗力】 功能属性加入战斗力初始化
|
2021-09-17 15:08:37 +08:00 |
jiaoyangna
|
32ba399115
|
【ID1018484】
【森罗幻境】抽到整只灵兽,需要重登才会显示在背包
|
2021-09-17 14:47:20 +08:00 |
gaoxin
|
2494b16f89
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
|
2021-09-16 13:37:16 +08:00 |
gaoxin
|
66efc9d4e3
|
【战斗力】新战斗力计算系统完成
|
2021-09-16 13:35:33 +08:00 |