jiaoyangna
|
d0d93e02ea
|
代码星星层级设置修改
|
2021-11-05 13:18:55 +08:00 |
gaoxin
|
2f65f4d391
|
【心魔试炼】界面报错修复
|
2021-11-05 11:06:10 +08:00 |
jiaoyangna
|
0d68d9229b
|
神魂提交
|
2021-11-05 10:18:10 +08:00 |
jiaoyangna
|
154aa77cd3
|
神魂特效修改提交
|
2021-11-04 10:46:25 +08:00 |
jiaoyangna
|
596c8477d3
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-04 09:29:56 +08:00 |
jiaoyangna
|
34d8cf4440
|
神魂位置提交
|
2021-11-04 09:27:56 +08:00 |
jiaoyangna
|
125e37fe6d
|
神魂提交
|
2021-11-03 10:13:44 +08:00 |
ZhangBiao
|
1e203c822c
|
【界面优化】好感度,天枢密卷
|
2021-11-02 13:41:27 +08:00 |
gaoxin
|
5044a79789
|
Revert "Revert "【界面优化】心魔试炼、战斗统计、法宝进阶""
This reverts commit 2901a60489 .
|
2021-11-01 18:59:11 +08:00 |
zhangshanxue
|
2901a60489
|
Revert "【界面优化】心魔试炼、战斗统计、法宝进阶"
This reverts commit 75827dc392 .
|
2021-11-01 18:53:54 +08:00 |
gaoxin
|
c62c0bc549
|
【坐骑】修复人物变高的问题
|
2021-11-01 16:42:46 +08:00 |
gaoxin
|
10bfe9a7b7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-01 16:27:12 +08:00 |
gaoxin
|
1b0613673c
|
【坐骑】添加各个方向的偏移配置
|
2021-11-01 16:27:03 +08:00 |
ZhangBiao
|
cdc5b5854b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-01 16:20:40 +08:00 |
gaoxin
|
44cb4eb282
|
【坐骑】坐骑和人物层级改为表配置
|
2021-11-01 15:53:33 +08:00 |
ZhangBiao
|
75827dc392
|
【界面优化】心魔试炼、战斗统计、法宝进阶
|
2021-11-01 15:36:40 +08:00 |
jiaoyangna
|
766710dc6b
|
Merge branch 'china/dev' into 0功能/神魂
|
2021-10-29 13:25:35 +08:00 |
jiaoyangna
|
5abf6060d2
|
魂印商店刷新修改
|
2021-10-28 18:06:26 +08:00 |
jiaoyangna
|
feb859b9a6
|
魂印商店刷新修改
|
2021-10-28 18:01:48 +08:00 |
jiaoyangna
|
acf33d10a3
|
【ID1018914】
【心魔试炼】通过最高层后,点击快速挑战报服务器开小差错误提示
|
2021-10-28 17:59:56 +08:00 |
jiaoyangna
|
413d98fe82
|
【ID1010609】
【商店优化】魂印商店出现红色魂印时,点击刷新增加二次确认
|
2021-10-28 17:28:12 +08:00 |
jiaoyangna
|
d398c21668
|
神魂提交
|
2021-10-27 12:50:15 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
ZhangBiao
|
615fa3f7d7
|
【寻宝迷踪】去除log
|
2021-10-18 18:18:04 +08:00 |
ZhangBiao
|
bc7e316531
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-18 16:19:19 +08:00 |
ZhangBiao
|
1c137cc911
|
【寻宝迷踪】骑着坐骑寻宝,特效显示分割线,需要修改
|
2021-10-18 16:18:59 +08:00 |
jiaoyangna
|
2ed7770259
|
排行榜上小人方向修改
(cherry picked from commit 35e0b7e419 )
|
2021-10-15 12:13:37 +08:00 |
jiaoyangna
|
3e616a0462
|
排行榜上小人方向修改
(cherry picked from commit f31f62ec09 )
|
2021-10-15 12:13:28 +08:00 |
jiaoyangna
|
35e0b7e419
|
排行榜上小人方向修改
|
2021-10-15 11:53:16 +08:00 |
jiaoyangna
|
f31f62ec09
|
排行榜上小人方向修改
|
2021-10-15 11:51:38 +08:00 |
jiaoyangna
|
450d426232
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-10-15 10:05:22 +08:00 |
jiaoyangna
|
7ac2417ff8
|
【ID1010479】
天书秘卷调整
|
2021-10-15 09:54:12 +08:00 |
jiaoyangna
|
8c95ee03e9
|
【ID1010479】
天书秘卷调整
|
2021-10-14 20:18:02 +08:00 |
jiaoyangna
|
bbd9c9e1c2
|
坐骑方向调整
|
2021-10-14 16:37:09 +08:00 |
jiaoyangna
|
f964d2a10c
|
添加,缩短魂印名字
|
2021-10-14 15:16:14 +08:00 |
jiaoyangna
|
204aba3fde
|
缩短魂印名字
|
2021-10-14 15:14:07 +08:00 |
jiaoyangna
|
4f580146bd
|
【ID1010465】
增加白金装备图鉴
|
2021-10-14 12:01:55 +08:00 |
wangzhenxing
|
2237084155
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-10-12 20:08:46 +08:00 |
wangzhenxing
|
4317d1df54
|
奖励显示修改
|
2021-10-12 10:27:49 +08:00 |
jiaoyangna
|
1269b5b114
|
【ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 11:31:03 +08:00 |
jiaoyangna
|
7737449829
|
【ID1018681】
【好感度】逍遥游游历成功界面的礼物图标点不开
|
2021-10-09 12:14:34 +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
|
c778c334e5
|
添加道具属性显示
|
2021-09-27 16:49:25 +08:00 |
jiaoyangna
|
644d8e3790
|
长按短按效果添加
|
2021-09-27 16:43:01 +08:00 |
wangzhenxing
|
a3e1782007
|
【功能】==========白金装备合成提交
|
2021-09-26 17:30:35 +08:00 |
gaoxin
|
6a71a972e9
|
【战斗力】关闭一些log
|
2021-09-26 11:18:38 +08:00 |
gaoxin
|
8c76d476a2
|
【编队】修复保存编队接口名修改导致的报错
|
2021-09-24 17:49:32 +08:00 |
jiaoyangna
|
2e08cf7672
|
玲珑宝镜消耗道具添加加号
|
2021-09-23 15:50:32 +08:00 |
ZhangBiao
|
fc03b71b84
|
【七界试炼】tijiao
|
2021-09-23 14:21:30 +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
|
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 |
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
|
a15bd40b96
|
【寻宝迷踪】跳转惊喜礼盒
|
2021-09-18 11:33:46 +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 |
ZhangBiao
|
d49d73dcb5
|
【寻宝迷踪】跳转提交
|
2021-09-15 19:14:18 +08:00 |
gaoxin
|
7462f02cfd
|
Revert Revert 回滚错误的合并 4f19f12612
|
2021-09-15 14:29:14 +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 |
wangzhenxing
|
aaa4b987eb
|
玉虚论道修改
|
2021-09-11 19:47:23 +08:00 |
ZhangBiao
|
41282c144c
|
【七界试炼】七界币增加加号
|
2021-09-11 15:47:19 +08:00 |
wangzhenxing
|
e2f7284507
|
qqqq
|
2021-09-10 15:50:24 +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 |
jiaoyangna
|
a012ece114
|
【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
|
2021-09-08 10:27:26 +08:00 |
gaoxin
|
17ebbc1872
|
【优化】灵兽商城商品上显示当前已有的灵兽碎片
|
2021-09-06 18:19:45 +08:00 |
jiaoyangna
|
5af2fc261d
|
心魔修改提交
|
2021-09-03 18:56:46 +08:00 |
jiaoyangna
|
17f6cb8ff1
|
报错修改
|
2021-09-03 18:43:03 +08:00 |
jiaoyangna
|
4d5876eb28
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua
|
2021-09-02 19:33:48 +08:00 |
jiaoyangna
|
13909e60aa
|
编队id修改
|
2021-09-02 17:29:44 +08:00 |
jiaoyangna
|
96f2530ae8
|
加号修改
|
2021-09-02 16:20:33 +08:00 |
jiaoyangna
|
37c1c77737
|
添加道具 太初之气 加号
|
2021-09-02 16:17:26 +08:00 |
ZhangBiao
|
6bbf30e344
|
【心魔试炼、幸运探宝】星级特效显示、高级探宝时间显示000000
|
2021-09-02 11:19:29 +08:00 |
jiaoyangna
|
4f266a20b9
|
红点问题修改提交
|
2021-09-01 14:17:21 +08:00 |
jiaoyangna
|
a12c9330c7
|
四灵第二次修改提交
|
2021-09-01 10:08:25 +08:00 |
jiaoyangna
|
56af6f1a11
|
第一次bug修改提交
|
2021-08-31 20:22:59 +08:00 |
jiaoyangna
|
ad9e76bda5
|
四灵试炼修改提交
|
2021-08-31 19:03:29 +08:00 |
jiaoyangna
|
f712786650
|
排行榜宝物数据修改
|
2021-08-31 17:50:58 +08:00 |
jiaoyangna
|
ac22bd000b
|
装备宝物界面修改提交
|
2021-08-31 17:02:22 +08:00 |
jiaoyangna
|
4801852d88
|
神应修改提交
|
2021-08-30 18:09:06 +08:00 |
jiaoyangna
|
1ea100ed83
|
神将情报界面装备宝物修改提交
|
2021-08-30 16:44:26 +08:00 |
jiaoyangna
|
a76f27ecf0
|
四灵提交
|
2021-08-30 14:21:41 +08:00 |
jiaoyangna
|
2fbe372c76
|
四灵修改提交
|
2021-08-27 18:39:45 +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 |
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 |
ZhangBiao
|
6c2e75b384
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-20 14:40:19 +08:00 |
jiaoyangna
|
bb8ca3c5ca
|
四元阵跳转修改
|
2021-08-19 16:44:13 +08:00 |
ZhangBiao
|
9971d286ea
|
【寻宝迷踪】人物箭头提交
|
2021-08-16 15:37:01 +08:00 |
ZhangBiao
|
57cdcc0809
|
【寻宝迷踪】增加到达特效
|
2021-08-13 15:34:06 +08:00 |
jiaoyangna
|
76dbc01270
|
Merge branch 'china/dev' into 0功能/silingshilian
|
2021-08-12 15:54:58 +08:00 |
ZhangBiao
|
bbe2bb6d6d
|
【寻宝迷踪】提交
|
2021-08-12 12:00:18 +08:00 |
ZhangBiao
|
13777a78cb
|
【寻宝迷踪】增加主角箭头
|
2021-08-11 19:33:01 +08:00 |
ZhangBiao
|
d017873b79
|
【寻宝迷踪】提交
|
2021-08-10 15:27:32 +08:00 |
jiaoyangna
|
34357fddff
|
滑动条修改提交
|
2021-08-06 15:47:31 +08:00 |
jiaoyangna
|
5cf3388a59
|
滑动 回弹修改提交
|
2021-08-06 11:29:06 +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 |
jiaoyangna
|
488b7469f6
|
【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
|
2021-08-04 15:52:30 +08:00 |
jiaoyangna
|
3f9b6be120
|
【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
|
2021-08-04 15:36:39 +08:00 |
wangzhenxing
|
4358ef97e3
|
[bug]====聊天界面称号特效穿透问题修改
|
2021-08-02 14:27:13 +08:00 |
ZhangBiao
|
e829b33d14
|
【万象商会】白篇处理
|
2021-07-30 16:34:50 +08:00 |
gaoxin
|
5aadeb406b
|
【聊天】聊天框根据内容跳转到不同的频道
|
2021-07-30 14:07:08 +08:00 |
jiaoyangna
|
f4cc4d7df6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 17:46:11 +08:00 |
jiaoyangna
|
7ee1ef9910
|
Merge branch 'china/dev-c' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity5.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
# Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
|
2021-07-28 17:45:59 +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 |
jiaoyangna
|
7ac8f03cd3
|
Revert "Revert "宝物培养修改提交""
This reverts commit 4590076eb9 .
|
2021-07-28 16:58:52 +08:00 |
wangzhenxing
|
68e3a32140
|
[bug]====称号层级修改
|
2021-07-28 16:41:37 +08:00 |
wangzhenxing
|
ef714577e8
|
[bug]========称号显示修改
|
2021-07-28 16:10:58 +08:00 |
jiaoyangna
|
527295f30c
|
宝物优化
|
2021-07-28 10:51:39 +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
|
07de90eb45
|
【提交】
|
2021-07-26 15:07:49 +08:00 |
jiaoyangna
|
4590076eb9
|
Revert "宝物培养修改提交"
This reverts commit bcd0651029 .
|
2021-07-26 10:00:59 +08:00 |
ZhangBiao
|
7e9fad28b7
|
【万象商会】提交
|
2021-07-24 19:33:56 +08:00 |
ZhangBiao
|
4c73ac0976
|
【万象商会】刷新
|
2021-07-24 18:59:42 +08:00 |
ZhangBiao
|
ccc208b2c4
|
【万象商会】界面关闭
|
2021-07-24 17:02:30 +08:00 |
jiaoyangna
|
fd7d51168d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 19:12:46 +08:00 |
jiaoyangna
|
bcd0651029
|
宝物培养修改提交
|
2021-07-23 19:12:42 +08:00 |
ZhangBiao
|
38bbb808b4
|
【主题活动】商店
|
2021-07-23 19:05:53 +08:00 |
wangzhenxing
|
20bf67d50e
|
【称号】====称号特效显示修改,称号特效预设修改
|
2021-07-23 18:23:55 +08:00 |
wangzhenxing
|
02cea65055
|
[称号]====跨服称号资源提交
|
2021-07-23 11:20:05 +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 |
ZhangBiao
|
190f3722a8
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 14:04:11 +08:00 |
JLIOSM1
|
d680e5a507
|
Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua.meta
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua.meta
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua.meta
# Assets/StreamingAssets/Res/PackConfig.txt
# Assets/StreamingAssets/Res/_ReadMe.md
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png.meta
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png.meta
# Assets/StreamingAssets/Res/loading1.png
# Assets/StreamingAssets/Res/loading1.png.meta
# Assets/StreamingAssets/Res/loading2.png
# Assets/StreamingAssets/Res/loading2.png.meta
# Assets/StreamingAssets/Res/loading3.png
# Assets/StreamingAssets/Res/loading3.png.meta
# Assets/StreamingAssets/Res/loading4.png
# Assets/StreamingAssets/Res/loading4.png.meta
# Assets/StreamingAssets/Res/loading5.png
# Assets/StreamingAssets/Res/loading5.png.meta
# Assets/StreamingAssets/Res/loading6.png
# Assets/StreamingAssets/Res/loading6.png.meta
# Assets/StreamingAssets/Res/loading_caohua.png.meta
# Assets/StreamingAssets/Res/loading_xipu.png.meta
# Assets/StreamingAssets/Res/login_caohua.png.meta
# Assets/StreamingAssets/Res/login_video.mp4.meta
# Assets/StreamingAssets/Res/login_xipu.png.meta
|
2021-07-21 17:15:36 +08:00 |
JLIOSM1
|
c2dfe0ee92
|
【IOS提审】链接提审服时,部分按钮跳转到妖晶充值
|
2021-07-21 11:33:09 +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 |
gaoxin
|
2cc76fd123
|
Merge branch 'china/ios' into china/dev
|
2021-07-16 15:57:29 +08:00 |
JLIOSM1
|
56e7492a91
|
【商店】修复妖精商店资源回收导致白片
|
2021-07-16 15:37:48 +08:00 |
ZhangBiao
|
7e17f8c3a1
|
Merge branch 'china/dev' into 0优化/副本界面
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Data/UIData.lua
|
2021-07-15 19:48:50 +08:00 |
wangzhenxing
|
fe8714f7fa
|
[乾坤宝盒]========优化提交
|
2021-07-15 16:43:35 +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 |
gaoxin
|
1f4499e8bb
|
【物品特效】修复魂印特效显示错误
|
2021-07-09 17:05:55 +08:00 |
gaoxin
|
be7cc055a1
|
【物品特效】不再根据品质显示特效,根据新字段Quantity1判断显示
|
2021-07-09 14:56:57 +08:00 |
ZhangBiao
|
5e1897515b
|
【商店】商店黑屏修复
|
2021-07-09 11:10:38 +08:00 |
ZhangBiao
|
e64223b78b
|
【副本】新界面提交
|
2021-07-06 16:30:58 +08:00 |
ZhangBiao
|
7b66ae5db4
|
【副本】新界面
|
2021-07-06 14:47:10 +08:00 |
jiaoyangna
|
bd030bedbc
|
神将来源 新人商城 描述修改
|
2021-07-05 17:18:49 +08:00 |
jiaoyangna
|
c038859400
|
【ID1017091】
【神将来源】跳转首充,来源界面自动关闭,再次打开情报界面自动弹出
|
2021-07-05 11:29:05 +08:00 |
jiaoyangna
|
19247e296e
|
神将来源跳转修改提交
|
2021-07-02 11:23:07 +08:00 |
jiaoyangna
|
9b01d308e8
|
孙悟空添加新人商城
|
2021-07-02 11:13:59 +08:00 |
zhangqiang
|
a2528a3ded
|
【去掉无用打印】
|
2021-07-01 21:07:53 +08:00 |
jiaoyangna
|
410a0cac4f
|
神将来源跳转星辰商店修改提交
|
2021-07-01 18:22:36 +08:00 |
ZhangBiao
|
36ccbe968b
|
【森罗幻境】排行榜信息冗余修改
|
2021-07-01 15:42:23 +08:00 |
jiaoyangna
|
2cbb0b0a59
|
添加特效
|
2021-06-30 18:46:15 +08:00 |
jiaoyangna
|
3fadc63852
|
商店物品添加特效
|
2021-06-30 18:12:24 +08:00 |
jiaoyangna
|
9d11a48f70
|
跳转返回报错修改
|
2021-06-30 16:21:37 +08:00 |