ZhangBiao
|
1a866b1068
|
【七界试炼】提交
|
2021-09-24 19:23:30 +08:00 |
ZhangBiao
|
028f97c195
|
【七界试炼】红点和跳转i需改
|
2021-09-24 16:47:06 +08:00 |
jiaoyangna
|
80e2cab589
|
玲珑宝镜跳转修改提交
|
2021-09-23 16:50:24 +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
|
016f0159e5
|
【七界试炼】提交
|
2021-09-23 14:51:04 +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
|
af3f2b8f32
|
添加玲珑商市跳转
|
2021-09-22 20:22:59 +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 |
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 |
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 |
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 |
ZhangBiao
|
35e0c96748
|
【七界试炼】提交
|
2021-09-18 15:04:32 +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
|
5f11f26c4d
|
【红点】报错优化
|
2021-09-17 15:09:10 +08:00 |
gaoxin
|
a7ce05450b
|
【战斗力】 功能属性加入战斗力初始化
|
2021-09-17 15:08:37 +08:00 |
ZhangBiao
|
90a9abba0d
|
【寻宝迷踪】提价
|
2021-09-16 16:41:23 +08:00 |
gaoxin
|
7462f02cfd
|
Revert Revert 回滚错误的合并 4f19f12612
|
2021-09-15 14:29:14 +08:00 |
gaoxin
|
16633b37a8
|
【编队优化】
|
2021-09-10 16:25:38 +08:00 |
yuanshuai
|
4c66f50e66
|
Merge branch 'china/dev' into 0功能/四象心法
# Conflicts:
# 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/Practice/PracticePanel.lua
|
2021-09-10 09:38:55 +08:00 |
yuanshuai
|
247ad9fdc7
|
【四象心法提交】
|
2021-09-09 20:45:12 +08:00 |
jiaoyangna
|
4f266a20b9
|
红点问题修改提交
|
2021-09-01 14:17:21 +08:00 |
jiaoyangna
|
1744845cba
|
建木神树转移到修行
|
2021-09-01 11:57:15 +08:00 |
jiaoyangna
|
a12c9330c7
|
四灵第二次修改提交
|
2021-09-01 10:08:25 +08:00 |
jiaoyangna
|
72931e8ad6
|
失败返回报错修改
|
2021-08-31 13:59:03 +08:00 |
jiaoyangna
|
ab1a4ea627
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-26 17:42:25 +08:00 |
gaoxin
|
c325bf563f
|
Revert 回滚错误的合并 4f19f12612
|
2021-08-26 16:43:27 +08:00 |
jiaoyangna
|
0c7e38a715
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-25 15:25:54 +08:00 |
ZhangBiao
|
bd7383f063
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-23 16:47:26 +08:00 |
jiaoyangna
|
ca656636ac
|
太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
|
2021-08-23 14:09:43 +08:00 |
ZhangBiao
|
2612c2e01e
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-08-17 19:53:05 +08:00 |
jiaoyangna
|
faf7591cf5
|
玲珑宝镜修改
|
2021-08-17 17:14:03 +08:00 |
ZhangBiao
|
edc728227c
|
【寻宝密宗】提交
|
2021-08-10 14:57:45 +08:00 |
ZhangBiao
|
ab0dece261
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-06 11:32:10 +08:00 |
jiaoyangna
|
6b8c2f2f3c
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.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/Carbon/CarbonManager.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
|
2021-08-06 11:15:13 +08:00 |
ZhangBiao
|
4edc9a855b
|
【寻宝迷踪】提交
|
2021-08-05 17:23:25 +08:00 |
zhangqiang
|
1e4b55d9fd
|
【修改协议请求】修改进入游戏会向后的发送更换 称号 皮肤 坐骑 请求
|
2021-08-04 17:53:30 +08:00 |
ZhangBiao
|
50cbd0ea50
|
【灵兽山】增加灵兽界面跳转
|
2021-08-04 16:58:19 +08:00 |
gaoxin
|
54448208df
|
【切磋】战斗界面重复打开容错添加
|
2021-08-02 15:33:50 +08:00 |
wangzhenxing
|
31c19def0a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-29 17:34:55 +08:00 |
wangzhenxing
|
d8801cae6c
|
[称号]=============添加罗浮争锋称号 获得 及 到时 后消息推送
|
2021-07-29 17:34:40 +08:00 |
zhangqiang
|
9c28f232f6
|
【跨服排行榜】
|
2021-07-29 16:35:58 +08:00 |
zhangqiang
|
9a2d9c70a7
|
【新功能】罗浮争锋排行榜增加跨服切磋功能
|
2021-07-28 15:48:35 +08:00 |
ZhangBiao
|
ffd0685d97
|
【任务跳转】未解锁灵兽山,灵兽招募任务前往提示活动未开启,应提示功能未解锁
【红点】车迟斗法的红点仍绑在副本入口处,而非公会按钮
|
2021-07-28 11:20:27 +08:00 |
zhangqiang
|
71f7e8a469
|
Merge branch 'china/dev' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-07-27 11:26:30 +08:00 |
DESKTOP-98AVA47\Administrator
|
022681face
|
红点修改提交
|
2021-07-23 11:36:44 +08:00 |