Commit Graph

5991 Commits (ac88b50cae1d0d6b2c279f5352d927de826731d0)

Author SHA1 Message Date
gaoxin ac88b50cae 【编队】修复打开四灵试炼编队报错 2021-09-23 16:05:18 +08:00
gaoxin f6c336e52f 【战斗力】添加一些log 2021-09-23 15:52:19 +08:00
gaoxin 1e011b560a 【跨服】开服前七天无法进入跨服 2021-09-23 15:52:01 +08:00
gaoxin e362321aa5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 14:54:28 +08:00
gaoxin b32183f20a 【玩家数据】添加服务器开启时间字段 2021-09-23 14:54:12 +08:00
ZhangBiao 524521d526 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 14:51:15 +08:00
ZhangBiao 016f0159e5 【七界试炼】提交 2021-09-23 14:51:04 +08:00
jiaoyangna ec18db0efb Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 14:33:44 +08:00
jiaoyangna fb82580b37 玲珑商市修改提交 2021-09-23 14:33:31 +08:00
ZhangBiao fc03b71b84 【七界试炼】tijiao 2021-09-23 14:21:30 +08:00
ZhangBiao 524bd129bc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 14:13:53 +08:00
ZhangBiao 9bac3f850e 【七界试炼】提交 2021-09-23 14:13:34 +08:00
jiaoyangna e1abfa42e5 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 12:30:37 +08:00
jiaoyangna 0705837511 玲珑宝镜间隔修改提交 2021-09-23 12:30:22 +08:00
ZhangBiao ad3ea41597 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 12:02:10 +08:00
ZhangBiao 5c11a67393 【七界试炼】修改提交 2021-09-23 12:01:58 +08:00
jiaoyangna a1a3eda93c Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 11:17:01 +08:00
jiaoyangna 09a71048c7 红点检测提交 2021-09-23 11:16:46 +08:00
wangzhenxing cbb22260f3 Merge branch 'china/dev-c-battle' into china/dev 2021-09-23 11:02:19 +08:00
wangzhenxing fbaca4e989 [战斗]====添加间接治疗得方法 2021-09-23 10:51:21 +08:00
jiaoyangna 6b6c6b48db Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-23 09:51:59 +08:00
jiaoyangna d6002c5242 玲珑报镜十连修改提交 2021-09-23 09:51:45 +08:00
gaoxin 913d3c14a7 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 20:54:52 +08:00
gaoxin 4f9cc3ee44 【奖励界面】部分界面胡乱显示经验调 2021-09-22 20:54:46 +08:00
jiaoyangna ca74a5c158 玲珑宝镜动画修改 2021-09-22 20:39:06 +08:00
jiaoyangna 7e5061844b Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 20:23:45 +08:00
jiaoyangna af3f2b8f32 添加玲珑商市跳转 2021-09-22 20:22:59 +08:00
yuanshuai d8e88d4fba 【四象心法】点击消耗道具显示详情 2021-09-22 20:08:27 +08:00
jiaoyangna 4910773749 玲珑宝镜修改提交 2021-09-22 20:04:08 +08:00
jiaoyangna 0805ef4ebc Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 20:02:01 +08:00
ZhangBiao c29ad91a4c 【七界试炼】修改提交 2021-09-22 19:56:13 +08:00
ZhangBiao 32585cec01 【七界试炼】增加怪物详情界面 2021-09-22 19:38:16 +08:00
jiaoyangna 2f16f43379 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 18:02:32 +08:00
jiaoyangna aeecd125e0 【ID1010383】
【优化】玲珑宝镜新增进度条奖励
2021-09-22 17:34:16 +08:00
ZhangBiao 042df03091 【七界试炼】零点不刷新修改 2021-09-22 16:45:23 +08:00
ZhangBiao 5f80bbb7a1 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 16:26:04 +08:00
ZhangBiao 0b9055110d 【七界试炼】红点 2021-09-22 16:25:29 +08:00
yuanshuai 573cb8a8e3 误操作 2021-09-22 16:17:09 +08:00
gaoxin 579b566935 【四象心法】加入新的战斗力计算 2021-09-22 15:42:28 +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
ZhangBiao 371c0fc080 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
2021-09-22 15:21:59 +08:00
ZhangBiao 40fb962879 【七界试炼】合并后提交 2021-09-22 15:19:27 +08:00
yuanshuai b145159311 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-09-22 15:13:12 +08:00
yuanshuai db18313495 Merge branch '0功能/四象心法' into china/dev
# Conflicts:
#	Assets/ManagedResources/EffectResUI/XunBaoMiZong.meta
#	Assets/ManagedResources/Icon/Item/r_yjsp.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Logic/GameEvent.lua
#	Assets/ManagedResources/~Lua/Message/ActivityProto.proto
#	Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
#	Assets/ManagedResources/~Lua/Message/ChatProto.proto
#	Assets/ManagedResources/~Lua/Message/CommonProto.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/GeneralPanel/GeneralInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
2021-09-22 15:12:32 +08:00
gaoxin fa85ecb870 Revert "Revert "【优化】优化装备界面卡顿,一键卸下/装备卡顿的问题""
This reverts commit 0e86945c53.
2021-09-22 14:59:34 +08:00
ZhangBiao cea14746f8 【七界试炼】提交 2021-09-22 13:33:48 +08:00
ZhangBiao 1c191a78b9 Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.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/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
2021-09-22 11:46:24 +08:00
gaoxin bc659b68f8 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/Editor/AutoPack.cs
#	Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs
2021-09-22 10:54:15 +08:00
gaoxin e5af89fac9 Merge branch 'china/dev' into 0功能/玉虚论道
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
2021-09-22 10:37:42 +08:00
jiaoyangna 488753ab83 四灵编队修改提交
(cherry picked from commit 191603b77f)
2021-09-18 19:19:30 +08:00