wangzhenxing
|
d45abf6fcf
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-09-28 15:54:33 +08:00 |
wangzhenxing
|
f580f14a44
|
段位特效修改提交
|
2021-09-28 11:51:20 +08:00 |
ZhangBiao
|
422806200e
|
【御剑行】提交
|
2021-09-28 10:34:05 +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 |
jiaoyangna
|
8aeb4f2416
|
添加逍遥游跳转
|
2021-09-27 15:50:25 +08:00 |
ZhangBiao
|
810614f226
|
【四象心法】增加跳转
(cherry picked from commit 98d3911f23 )
|
2021-09-27 14:37:20 +08:00 |
ZhangBiao
|
98d3911f23
|
【四象心法】增加跳转
|
2021-09-27 14:32:59 +08:00 |
ZhangBiao
|
a3c65ee8d1
|
【装备名称】金色->白金
|
2021-09-27 11:12:21 +08:00 |
gaoxin
|
dcdaf48e4d
|
【玉虚】关闭manager初始化
|
2021-09-26 21:50:50 +08:00 |
jiaoyangna
|
3a5e3cf17e
|
好感度提交
|
2021-09-26 21:32:04 +08:00 |
wangzhenxing
|
e763b6472b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-26 17:31:16 +08:00 |
wangzhenxing
|
a3e1782007
|
【功能】==========白金装备合成提交
|
2021-09-26 17:30:35 +08:00 |
gaoxin
|
e61dea0f4a
|
【白金装备】套装显示添加
|
2021-09-26 17:13:12 +08:00 |
jiaoyangna
|
1152586ff1
|
好感度提交
|
2021-09-26 09:54:58 +08:00 |
gaoxin
|
ddb97196d9
|
【首充】金额改为special表配置
|
2021-09-24 11:05:39 +08:00 |
ZhangBiao
|
6ced770ef1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 19:23:37 +08:00 |
ZhangBiao
|
5af10faa57
|
【七界试炼】提交
|
2021-09-23 19:23:27 +08:00 |
jiaoyangna
|
fcae70ae04
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:50:48 +08:00 |
jiaoyangna
|
80e2cab589
|
玲珑宝镜跳转修改提交
|
2021-09-23 16:50:24 +08:00 |
ZhangBiao
|
93b3839727
|
【七界试炼】商店刷新事件
|
2021-09-23 16:46:35 +08:00 |
ZhangBiao
|
9b24649f36
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-23 16:08:13 +08:00 |
ZhangBiao
|
0422b5c738
|
【七界试炼】提交
|
2021-09-23 16:08:02 +08:00 |
gaoxin
|
ac88b50cae
|
【编队】修复打开四灵试炼编队报错
|
2021-09-23 16:05:18 +08:00 |
jiaoyangna
|
2e08cf7672
|
玲珑宝镜消耗道具添加加号
|
2021-09-23 15:50:32 +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
|
fb82580b37
|
玲珑商市修改提交
|
2021-09-23 14:33:31 +08:00 |
jiaoyangna
|
a8eeec83f6
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
|
2021-09-22 20:53:08 +08:00 |
jiaoyangna
|
529094b6ad
|
好感度第一次提交
|
2021-09-22 20:47:13 +08:00 |
jiaoyangna
|
af3f2b8f32
|
添加玲珑商市跳转
|
2021-09-22 20:22:59 +08:00 |
ZhangBiao
|
32585cec01
|
【七界试炼】增加怪物详情界面
|
2021-09-22 19:38:16 +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 |
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
|
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 |
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 |
ZhangBiao
|
488ad1caad
|
【七界试炼】七界秘宝提交
|
2021-09-17 17:42:18 +08:00 |
gaoxin
|
a7ce05450b
|
【战斗力】 功能属性加入战斗力初始化
|
2021-09-17 15:08:37 +08:00 |
ZhangBiao
|
60c954bf38
|
【七界试炼】提交
|
2021-09-16 19:36:16 +08:00 |
wangzhenxing
|
28d68a2d43
|
玉虚论道修改
|
2021-09-16 18:10:51 +08:00 |
gaoxin
|
66efc9d4e3
|
【战斗力】新战斗力计算系统完成
|
2021-09-16 13:35:33 +08:00 |
ZhangBiao
|
ad9bcaa2fa
|
【七界试炼】提交
|
2021-09-15 14:02:39 +08:00 |
jiaoyangna
|
d9c2f3451b
|
好感度第一次提交
|
2021-09-14 14:45:22 +08:00 |
yuanshuai
|
47cb5811cc
|
Merge branch 'china/dev' into 0功能/四象心法
|
2021-09-13 18:43:00 +08:00 |
ZhangBiao
|
b609616b6b
|
【七界试炼】提交
|
2021-09-13 18:06:39 +08:00 |
ZhangBiao
|
94ed6ad618
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2021-09-13 13:56:43 +08:00 |
ZhangBiao
|
8c9f31f028
|
【七界试炼】遗物
|
2021-09-13 11:42:14 +08:00 |
wangzhenxing
|
aaa4b987eb
|
玉虚论道修改
|
2021-09-11 19:47:23 +08:00 |
yuanshuai
|
0d32db8623
|
【四象心法】bug修改
|
2021-09-11 17:50:21 +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 |
ZhangBiao
|
41282c144c
|
【七界试炼】七界币增加加号
|
2021-09-11 15:47:19 +08:00 |
jiaoyangna
|
f49634a6fb
|
【ID1018456】
【新推送礼包】礼包文案需要修改
|
2021-09-11 15:18:47 +08:00 |
wangzhenxing
|
4b5c55a1ab
|
qqq
|
2021-09-11 15:05:37 +08:00 |
yuanshuai
|
38947760c1
|
【四象心法】bug修改
|
2021-09-11 13:37:26 +08:00 |
ZhangBiao
|
4eb8e566fe
|
【七界试炼】战斗结束提交
|
2021-09-10 18:36:39 +08:00 |
ZhangBiao
|
d6725f3320
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
|
2021-09-10 16:39:43 +08:00 |
gaoxin
|
7bce643c71
|
【尝试修复IOS不明原因报错】
|
2021-09-10 16:31:29 +08:00 |
wangzhenxing
|
e2f7284507
|
qqqq
|
2021-09-10 15:50:24 +08:00 |
yuanshuai
|
e91140175f
|
四象心法添加通用等级限制
|
2021-09-10 15:44:32 +08:00 |
ZhangBiao
|
42df2f4af5
|
【七界试炼】提交
|
2021-09-10 15:23:15 +08:00 |
ZhangBiao
|
2d003aaafd
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# 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/Net/NetManager.lua
|
2021-09-10 10:33:44 +08:00 |
ZhangBiao
|
cef2b42bcc
|
【七界试炼】提交
|
2021-09-10 10:30:50 +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 |
gaoxin
|
8bb679214b
|
【玉虚】QA提示添加
|
2021-09-09 19:21:50 +08:00 |
gaoxin
|
065734184e
|
【玉虚】商店跳转添加
|
2021-09-09 15:16:41 +08:00 |
gaoxin
|
60b842e2ab
|
【排行榜】报错修复
|
2021-09-09 14:05:44 +08:00 |
wangzhenxing
|
a58b5f2d88
|
玉虚论道提交
|
2021-09-09 11:48:09 +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 |
ZhangBiao
|
1fefbb43e6
|
【七界试炼】提交
|
2021-09-09 11:10:43 +08:00 |
gaoxin
|
5e938b5141
|
【巅峰赛】选拔赛组界面添加角色信息展示-修复查看编队是主线编队的问题
|
2021-09-09 10:45:40 +08:00 |
ZhangBiao
|
2fe984719b
|
【七界试炼】遗物1/2
|
2021-09-08 16:26:40 +08:00 |
ZhangBiao
|
1693300255
|
【七界试炼】目标特性
|
2021-09-08 10:06:24 +08:00 |
ZhangBiao
|
adb77b501e
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-09-07 19:26:13 +08:00 |
wangzhenxing
|
03b2acbb91
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-09-07 18:45:25 +08:00 |
wangzhenxing
|
5f0bfe53bd
|
玉虚论道提交
|
2021-09-07 17:05:46 +08:00 |
jiaoyangna
|
466bee75bd
|
四灵排行榜类型修改
|
2021-09-06 19:10:26 +08:00 |
gaoxin
|
17ebbc1872
|
【优化】灵兽商城商品上显示当前已有的灵兽碎片
|
2021-09-06 18:19:45 +08:00 |
ZhangBiao
|
6078ae545a
|
【七界试炼】提交
|
2021-09-06 17:21:53 +08:00 |
ZhangBiao
|
d564f0cf11
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-09-06 11:16:40 +08:00 |
jiaoyangna
|
5af2fc261d
|
心魔修改提交
|
2021-09-03 18:56:46 +08:00 |
jiaoyangna
|
13909e60aa
|
编队id修改
|
2021-09-02 17:29:44 +08:00 |
jiaoyangna
|
37c1c77737
|
添加道具 太初之气 加号
|
2021-09-02 16:17:26 +08:00 |
jiaoyangna
|
186b2ca0c3
|
四灵修改提交
|
2021-09-02 16:09:04 +08:00 |
jiaoyangna
|
a12c9330c7
|
四灵第二次修改提交
|
2021-09-01 10:08:25 +08:00 |
jiaoyangna
|
13f74e0185
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-31 11:39:16 +08:00 |
wangzhenxing
|
01ad6f3229
|
【玉虚轮道】=====功能入口提交
|
2021-08-30 15:41:14 +08:00 |
jiaoyangna
|
a76f27ecf0
|
四灵提交
|
2021-08-30 14:21:41 +08:00 |
jiaoyangna
|
2fbe372c76
|
四灵修改提交
|
2021-08-27 18:39:45 +08:00 |
ZhangBiao
|
7ca7e78761
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-27 15:59:38 +08:00 |
ZhangBiao
|
12c2fd7316
|
【推荐公会】增加分页请求
|
2021-08-27 15:59:22 +08:00 |
gaoxin
|
792a72676a
|
【适龄提示】
|
2021-08-27 14:20:36 +08:00 |
ZhangBiao
|
74f0e3f8a2
|
【玉虚论道】编队界面提交
|
2021-08-27 13:45:09 +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 |
jiaoyangna
|
cd594275e0
|
四灵试炼修改提交
|
2021-08-26 17:25:02 +08:00 |
gaoxin
|
c325bf563f
|
Revert 回滚错误的合并 4f19f12612
|
2021-08-26 16:43:27 +08:00 |
zhangqiang
|
5b9542d391
|
【跨服十绝阵】请求跨服排行
|
2021-08-26 14:12:28 +08:00 |
ZhangBiao
|
6345a18ebe
|
【玉虚论道】我的编队界面
|
2021-08-26 13:42:17 +08:00 |
gaoxin
|
eebd99883b
|
【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题
|
2021-08-25 20:59:26 +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 |
jiaoyangna
|
404a30a57d
|
四灵修改提交
|
2021-08-25 15:15:50 +08:00 |
gaoxin
|
f778b03879
|
【打开网页】添加打开内置浏览器和外部浏览器的配置,解决老包无法打开网页的问题
|
2021-08-25 14:27:08 +08:00 |
zhangqiang
|
dd37961be0
|
【跨服十绝阵】 回退特殊处理
|
2021-08-25 13:53:40 +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
|
16ca4f84d6
|
太初秘卷红点修改提交
(cherry picked from commit b11e01a2972353c71d7c90c3a6443ded59892981)
|
2021-08-23 14:27:41 +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
|
fab5388536
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-08-17 13:47:27 +08:00 |
zhangqiang
|
617d4d39c3
|
【十绝阵】排行榜修改
|
2021-08-13 16:35:33 +08:00 |
jiaoyangna
|
5c4696ad6c
|
太初秘卷修改提交
|
2021-08-12 17:32:34 +08:00 |
jiaoyangna
|
76dbc01270
|
Merge branch 'china/dev' into 0功能/silingshilian
|
2021-08-12 15:54:58 +08:00 |
ZhangBiao
|
a0ef88e58d
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-08-12 14:56:26 +08:00 |
jiaoyangna
|
c3d45f1316
|
【ID1010059】
【新功能】太初密卷
|
2021-08-11 15:15:41 +08:00 |
ZhangBiao
|
6e9136aa14
|
【寻宝密宗】增加QA
|
2021-08-10 16:17:28 +08:00 |
ZhangBiao
|
d017873b79
|
【寻宝迷踪】提交
|
2021-08-10 15:27:32 +08:00 |
ZhangBiao
|
edc728227c
|
【寻宝密宗】提交
|
2021-08-10 14:57:45 +08:00 |
ZhangBiao
|
0520c4c685
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-09 10:01:11 +08:00 |
zhangqiang
|
43609ae65d
|
山河设计图觉醒图标修正
|
2021-08-06 14:42:34 +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 |
ZhangBiao
|
1c0880abbf
|
【寻宝迷踪】
|
2021-08-05 14:31:31 +08:00 |
ZhangBiao
|
87cf2102fe
|
【寻宝迷踪】添加资源
|
2021-08-04 18:16:36 +08:00 |
ZhangBiao
|
28b794eea2
|
【寻宝迷踪】开坑
|
2021-08-03 10:27:36 +08:00 |
zhangqiang
|
acf647d9c5
|
【罗浮争锋】
|
2021-07-31 17:20:07 +08:00 |
zhangqiang
|
c11d9849fd
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts:
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-07-29 16:38:35 +08:00 |
zhangqiang
|
9c28f232f6
|
【跨服排行榜】
|
2021-07-29 16:35:58 +08:00 |
gaoxin
|
1b3e5c196b
|
【跨服聊天】完善跨服聊天角色信息显示
|
2021-07-29 11:46:59 +08:00 |
gaoxin
|
381d537a4e
|
【登录】除流畅,拥挤和爆满外的其他状态全部不可进入游戏
|
2021-07-29 11:44:35 +08:00 |
gaoxin
|
e552db5499
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 17:43:04 +08:00 |
gaoxin
|
ef78e0ae21
|
【跨服聊天】添加跨服聊天频道
|
2021-07-28 17:42:58 +08:00 |
wangzhenxing
|
ef714577e8
|
[bug]========称号显示修改
|
2021-07-28 16:10:58 +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 |
ZhangBiao
|
b910dcfc6f
|
【主题活动商店】增加商店类型
|
2021-07-24 16:30:19 +08:00 |
ZhangBiao
|
38bbb808b4
|
【主题活动】商店
|
2021-07-23 19:05:53 +08:00 |
wangzhenxing
|
20bf67d50e
|
【称号】====称号特效显示修改,称号特效预设修改
|
2021-07-23 18:23:55 +08:00 |
DESKTOP-98AVA47\Administrator
|
022681face
|
红点修改提交
|
2021-07-23 11:36:44 +08:00 |
wangzhenxing
|
d0d533cecc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 11:08:03 +08:00 |
wangzhenxing
|
f7029c2ef0
|
[功能]==============15日登陆添加 预告
|
2021-07-23 11:07:46 +08:00 |
ZhangBiao
|
a33be944cc
|
【万象商会】提交
|
2021-07-22 19:53:25 +08:00 |
zhangqiang
|
1cf142c82b
|
【跨服天梯】国内提交+1
|
2021-07-22 19:01:46 +08:00 |
ZhangBiao
|
b0e53312e7
|
【心愿抽卡】增加英雄加入卡池的天数条件
|
2021-07-21 17:35:38 +08:00 |
jiaoyangna
|
740592309d
|
【ID1017508】
【点将台】道具足够10连抽时,10连按钮没有红点
|
2021-07-21 11:22:56 +08:00 |
zhangqiang
|
b395410ac1
|
Merge branch 'china/dev' into china/dev_c_跨服天梯
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
# Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
|
2021-07-20 18:09:07 +08:00 |
zhangqiang
|
99cad10435
|
【跨服天梯】国内提交+1
|
2021-07-19 15:49:48 +08:00 |
jiaoyangna
|
61a2da78cd
|
超值基金跳转
|
2021-07-19 11:48:41 +08:00 |
jiaoyangna
|
4f0f69b17e
|
玲珑报警
|
2021-07-16 17:41:56 +08:00 |