gaoxin
|
5d2838554d
|
Merge branch '0活动/新大圣升星' into china/dev
|
2022-01-14 14:00:20 +08:00 |
gaoxin
|
e7a17fcd9e
|
【云梦豪礼】每日添加红点提示
|
2022-01-14 14:00:13 +08:00 |
ZhangBiao
|
f94e79b6e2
|
【百宝商会】新增跳转
|
2022-01-11 11:29:43 +08:00 |
gaoxin
|
ee60ae6c9a
|
【限时升星】显示优化,红点添加,条件屏蔽添加
|
2022-01-10 11:44:39 +08:00 |
ZhangBiao
|
6b1c28a920
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2022-01-06 16:40:24 +08:00 |
jiaoyangna
|
b1be355601
|
Merge branch 'tansuo' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/ExploreAtlas.meta
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2022-01-06 16:07:59 +08:00 |
ZhangBiao
|
9c874f1789
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
# Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
|
2022-01-06 15:38:48 +08:00 |
ZhangBiao
|
68ad9cf7e1
|
【家园】提交
|
2022-01-06 11:45:28 +08:00 |
ZhangBiao
|
499e1d2d49
|
【家园】界面微调
|
2022-01-06 10:56:59 +08:00 |
jiaoyangna
|
6ca1e17d52
|
【ID1010994】
增加单笔充值活动
|
2022-01-05 15:38:02 +08:00 |
ZhangBiao
|
f0de43aad2
|
【家园】提交
|
2022-01-05 14:17:53 +08:00 |
ZhangBiao
|
5e0c53e322
|
【家园】替换底图
|
2022-01-04 18:58:34 +08:00 |
ZhangBiao
|
a07fdc40ac
|
【家园】提交
|
2022-01-04 15:10:35 +08:00 |
ZhangBiao
|
fbe50eb413
|
【家园】提交
|
2022-01-04 10:51:59 +08:00 |
ZhangBiao
|
2b3afae7ea
|
【家园】特权
|
2021-12-31 18:13:10 +08:00 |
ZhangBiao
|
27ead6dcff
|
【家园】提交
|
2021-12-31 16:30:53 +08:00 |
jiaoyangna
|
80263f61f0
|
探索优化提交
|
2021-12-30 13:50:39 +08:00 |
jiaoyangna
|
7b67ef38df
|
Merge branch 'china/dev' into tansuo
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-12-30 11:43:22 +08:00 |
jiaoyangna
|
b46a62c25a
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-29 17:11:09 +08:00 |
jiaoyangna
|
f0a4cec767
|
【ID1010975】
【优化】超值返利每日首次登陆有红点提示
|
2021-12-29 17:10:48 +08:00 |
jiaoyangna
|
b256c7a9c5
|
探索提交
|
2021-12-28 14:50:45 +08:00 |
gaoxin
|
89f8af19c4
|
【主城】竖条改为初始打开
|
2021-12-31 01:53:05 +08:00 |
ZhangBiao
|
e6aa1d31fe
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
|
2021-12-23 09:43:06 +08:00 |
gaoxin
|
86daa70b9c
|
【特权】添加充值金额解锁类型
|
2021-12-21 16:33:28 +08:00 |
ZhangBiao
|
745a9d1dae
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-12-20 14:07:56 +08:00 |
jiaoyangna
|
997aa4831f
|
至尊降世添加拍脸
|
2021-12-20 13:41:16 +08:00 |
ZhangBiao
|
a197f16837
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-12-17 15:46:53 +08:00 |
jiaoyangna
|
4fdd4e7b62
|
跳转修改提交
|
2021-12-17 13:29:08 +08:00 |
gaoxin
|
ab3d7e939b
|
【解锁提示】添加功能解锁提示
|
2021-12-26 19:12:25 +08:00 |
ZhangBiao
|
0b9bd476dd
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-13 17:26:43 +08:00 |
ZhangBiao
|
6e92bbd082
|
【红点】主题活动入口显示红点,签到后或领达人活动奖励后,红点消失
|
2021-12-13 11:04:27 +08:00 |
ZhangBiao
|
f444315fee
|
Merge branch 'china/dev' into 0功能/命格
|
2021-12-10 18:32:41 +08:00 |
ZhangBiao
|
c11848b98a
|
【命格】红点提交
|
2021-12-10 18:27:43 +08:00 |
ZhangBiao
|
ad589aa449
|
【命格】提交
|
2021-12-10 17:18:18 +08:00 |
gaoxin
|
d2adaaba8d
|
【特权】二倍速不再判断等级提示
|
2021-12-10 16:39:10 +08:00 |
ZhangBiao
|
f09556242d
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
|
2021-12-10 14:16:28 +08:00 |
ZhangBiao
|
82c89e5e7d
|
【命格】提交
|
2021-12-10 13:57:24 +08:00 |
jiaoyangna
|
e33181dddb
|
招募秘宝提交
|
2021-12-10 13:41:03 +08:00 |
ZhangBiao
|
86f1620e7d
|
【连购好礼】活动时间兼容调整
|
2021-12-07 15:22:52 +08:00 |
ZhangBiao
|
9db47caa8e
|
【连购礼包】跳转修改
|
2021-12-06 18:59:57 +08:00 |
jiaoyangna
|
c83f294a67
|
跳转修改提交
|
2021-12-06 16:31:30 +08:00 |
jiaoyangna
|
6036916582
|
身外化身添加跳转
|
2021-12-06 16:22:13 +08:00 |
ZhangBiao
|
8e7afd757d
|
【连购礼包】提交
|
2021-12-03 13:21:15 +08:00 |
jiaoyangna
|
1253466912
|
天地烘炉提交
|
2021-12-02 15:18:56 +08:00 |
jiaoyangna
|
1a40cfba00
|
天地烘炉提交
|
2021-11-26 17:54:35 +08:00 |
jiaoyangna
|
2814265ba7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-26 17:06:24 +08:00 |
jiaoyangna
|
5542212cc1
|
天地烘炉提交
|
2021-11-26 17:04:54 +08:00 |
ZhangBiao
|
ed45f56479
|
【主角】未到开启等级有红点
|
2021-11-26 16:44:01 +08:00 |
jiaoyangna
|
b6bcd50dd3
|
身外化身修改提交
|
2021-11-26 14:11:23 +08:00 |
jiaoyangna
|
1e17151d7f
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
|
2021-11-26 11:35:57 +08:00 |