Commit Graph

303 Commits (3d9bf0041f1718da4805ca703ff445e4af61d7c3)

Author SHA1 Message Date
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
jiaoyangna 4e74731a43 【ID1018450】
【无尽副本】一键上阵会上阵空血神将
2021-09-11 17:11:39 +08:00
gaoxin 7df51e8929 Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/MapRoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
2021-09-11 16:52:33 +08:00
jiaoyangna 14559c4d6a 【ID1018450】
【无尽副本】一键上阵会上阵空血神将
2021-09-11 14:38:12 +08:00
gaoxin 16633b37a8 【编队优化】 2021-09-10 16:25:38 +08:00
gaoxin 3e3d0d9416 Merge remote-tracking branch 'origin/china/xq' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
#	Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
#	Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/View/ItemView.lua
2021-09-09 11:22:47 +08:00
gaoxin 992608f7a4 【无尽地图】部分事件未解绑 2021-09-08 18:27:44 +08:00
gaoxin c4bced89f7 【战斗校验】山河社稷图,跨服战斗,地图战斗添加战斗校验 2021-09-08 18:27:20 +08:00
jiaoyangna f712786650 排行榜宝物数据修改 2021-08-31 17:50:58 +08:00
jiaoyangna dd93f737ff 排行榜上好友宝器修改 2021-08-31 15:05:17 +08:00
gaoxin a96b609a49 【森罗幻境】修复未开启时红点方法报错 2021-07-31 16:49:28 +08:00
ZhangBiao bc46019646 【战令优化】无尽副本任务数量冗余修改 2021-07-29 17:12:21 +08:00
wangzhenxing ef714577e8 [bug]========称号显示修改 2021-07-28 16:10:58 +08:00
jiaoyangna b0c50a4571 id1017799
(cherry picked from commit 35a048adc9)
2021-07-28 11:07:16 +08:00
jiaoyangna efc0f62cc5 【ID1017708】
【无尽副本】购买秘宝后等待下一期秘宝刷新,上一期购买秘宝获得的积分不清,导致下期秘宝无法正常领取奖励

(cherry picked from commit 76fad397de)
2021-07-26 16:06:21 +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
ZhangBiao 056d3dc094 Merge branch 'china/dev' into 0优化/副本界面 2021-07-22 17:01:32 +08:00
jiaoyangna 7959f803c4 取消注释 2021-07-22 16:15:47 +08:00
jiaoyangna b0f868485e 无尽秘宝推送 2021-07-22 16:05:58 +08:00
JLIOSM1 e694302cac 【MapPlayerView】随机方法修改 2021-07-21 16:41:33 +08:00
JLIOSM1 3027e991c9 【IOS提审】提审服关闭公会红包,无尽秘宝按钮显示 2021-07-21 14:55:47 +08:00
ZhangBiao 109a109301 Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
#	Assets/ManagedResources/Atlas/CarbonNewAtlas.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta
#	Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/StreamingAssets/Android.meta
2021-07-15 16:19:05 +08:00
jiaoyangna b03751a132 无尽副本九元露修改提交
(cherry picked from commit bbf89bbd3a)
2021-07-10 14:02:18 +08:00
jiaoyangna 36a4a6241f 无尽副本修改提交
(cherry picked from commit 2686f970d7)
2021-07-09 17:11:29 +08:00
jiaoyangna 751f7cd84b 【ID1009609】
【优化】无尽副本优化

(cherry picked from commit dd1f598515)
2021-07-09 17:11:23 +08:00
gaoxin 1a33172a27 【地图】节点27是特效节点 2021-07-09 15:02:11 +08:00
gaoxin 5d60ef45ab 【地图】添加第27号事件点 2021-07-09 14:37:40 +08:00
ZhangBiao 3764ac753b 【新副本】界面时间显示调整 2021-07-08 10:15:39 +08:00
jiaoyangna c72ccc962b 【ID1009632】
【优化】修改无尽副本对话ui
2021-07-07 11:53:23 +08:00
jiaoyangna 05ef24c89c 【ID1009632】
【优化】修改无尽副本对话ui
2021-07-06 19:01:27 +08:00
jiaoyangna bc34bdce69 【ID1009609】
【优化】无尽副本优化
2021-07-06 15:19:56 +08:00
jiaoyangna 3219a1a2b8 【ID1009609】
【优化】无尽副本优化
2021-07-06 14:43:45 +08:00
zhangqiang 8ba8c98345 【魂印穿戴】无尽副本注释魂印绑定英雄 2021-07-05 12:09:20 +08:00
zhangqiang a2528a3ded 【去掉无用打印】 2021-07-01 21:07:53 +08:00
ZhangBiao 53567ea586 【Log】清除带颜色的Log 2021-07-01 16:33:40 +08:00
jiaoyangna f4fe155533 大圣修改 2021-06-19 17:47:35 +08:00
jiaoyangna 4f115efb05 活动提交 2021-06-17 17:18:42 +08:00