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 |
jiaoyangna
|
6ca1e17d52
|
【ID1010994】
增加单笔充值活动
|
2022-01-05 15:38:02 +08:00 |
ZhangBiao
|
f0de43aad2
|
【家园】提交
|
2022-01-05 14:17:53 +08:00 |
ZhangBiao
|
a07fdc40ac
|
【家园】提交
|
2022-01-04 15:10:35 +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
|
f0a4cec767
|
【ID1010975】
【优化】超值返利每日首次登陆有红点提示
|
2021-12-29 17:10:48 +08:00 |
jiaoyangna
|
b256c7a9c5
|
探索提交
|
2021-12-28 14:50:45 +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
|
c11848b98a
|
【命格】红点提交
|
2021-12-10 18:27:43 +08:00 |
ZhangBiao
|
ad589aa449
|
【命格】提交
|
2021-12-10 17:18:18 +08:00 |
jiaoyangna
|
e33181dddb
|
招募秘宝提交
|
2021-12-10 13:41:03 +08:00 |
jiaoyangna
|
1a40cfba00
|
天地烘炉提交
|
2021-11-26 17:54:35 +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 |
ZhangBiao
|
a8f666e901
|
【删除活动类型43】
|
2021-11-25 17:27:02 +08:00 |
ZhangBiao
|
cb331c612e
|
【删除活动类那个43】
|
2021-11-25 16:51:35 +08:00 |
jiaoyangna
|
a248330241
|
Merge branch 'china/dev' into 0功能/Incarnation
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# 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/ArenaInfoProto_pb.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/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
|
2021-11-25 16:10:14 +08:00 |
jiaoyangna
|
db0fcea43e
|
Merge branch 'china/dev' into 0功能/TailsMainSoul
# 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/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-19 18:01:59 +08:00 |
ZhangBiao
|
7d0a24a3cc
|
【灵脉秘境】提交
|
2021-11-18 17:15:16 +08:00 |
jiaoyangna
|
4d887421ea
|
身外化身提交
|
2021-11-18 11:55:26 +08:00 |
jiaoyangna
|
1e4a7a57be
|
法宝之魂 提交
|
2021-11-16 15:24:17 +08:00 |
jiaoyangna
|
e6f4e50656
|
法宝聚灵
|
2021-11-15 18:24:39 +08:00 |
gaoxin
|
d23318b53d
|
【周卡】红点添加,协议修改,推送逻辑添加
|
2021-10-29 16:43:53 +08:00 |
ZhangBiao
|
55090ed8cc
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-27 18:08:28 +08:00 |
ZhangBiao
|
3b42cd525e
|
【三界降魔】新活动完成
|
2021-10-27 18:08:16 +08:00 |
gaoxin
|
aabf86ba56
|
【山河社稷图】红点父节点错误
|
2021-10-27 16:36:56 +08:00 |
ZhangBiao
|
abd9795933
|
【百宝商会】红点提交
|
2021-10-25 11:15:27 +08:00 |
gaoxin
|
99985c442d
|
【积天豪礼】红点加入主界面下拉按钮红点
|
2021-11-10 01:17:28 +08:00 |
wangzhenxing
|
ae47df29bb
|
【红点】=============修行技能红点提交
|
2021-10-22 10:08:53 +08:00 |
ZhangBiao
|
a6ebd138e4
|
【新百宝商会】提交
|
2021-10-21 17:28:53 +08:00 |
gaoxin
|
85b15d6cb7
|
Merge branch 'china/dev' into 0活动开发聚集地/挚礼月卡
|
2021-10-20 15:14:38 +08:00 |
ZhangBiao
|
f75e42d9c9
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
|
2021-10-20 13:41:32 +08:00 |
ZhangBiao
|
7bd64b6a13
|
Merge branch 'china/dev' into 0功能/主角修为
|
2021-10-20 13:16:07 +08:00 |
ZhangBiao
|
76cfad3419
|
【主角修为】完成提交
|
2021-10-20 13:15:31 +08:00 |
gaoxin
|
47d6de27ff
|
【山河社稷图】添加每日奖励按钮及领取逻辑添加
|
2021-10-18 18:06:47 +08:00 |
gaoxin
|
3a559c912c
|
【挚礼月卡】月卡功能数据剥离到MonthCardManager
|
2021-10-18 16:22:11 +08:00 |
ZhangBiao
|
3d0e6a4be4
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-10-18 11:35:58 +08:00 |
jiaoyangna
|
450d426232
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-10-15 10:05:22 +08:00 |
ZhangBiao
|
4b6079d4e8
|
【御剑行】提价
|
2021-10-14 17:10:40 +08:00 |
ZhangBiao
|
67026aa355
|
Merge branch 'china/dev' into 0活动开发聚集地/御剑行
# Conflicts:
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2021-10-14 16:13:07 +08:00 |
ZhangBiao
|
3d1a5ebd4c
|
【御剑行】提交
|
2021-10-14 15:30:46 +08:00 |
jiaoyangna
|
4f580146bd
|
【ID1010465】
增加白金装备图鉴
|
2021-10-14 12:01:55 +08:00 |
wangzhenxing
|
1ad72ca981
|
红点检测修改
|
2021-10-12 20:41:57 +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
|
e28ca0087f
|
红点提交
|
2021-10-12 19:50:41 +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 |