Commit Graph

570 Commits (74c2f67d10c8c2b4ba5641c477e46f042b021485)

Author SHA1 Message Date
yuanshuai 2d18090df7 周卡月卡脚本预设提交 2022-06-09 14:19:07 +08:00
wangzhenxing dd7a256469 [周卡]======红点修改提交 2022-06-01 14:50:08 +08:00
wangzhenxing 054c31caee [周卡]=====红点提交 2022-06-01 13:23:34 +08:00
yuanshuai d39933b48d 红点提交 2022-05-18 20:06:18 +08:00
yuanshuai 9e0e197a2b 商店代币页签红点修改 2022-04-28 17:12:25 +08:00
yuanshuai 4e70fc5113 限时活动红点修改 2022-04-28 14:26:35 +08:00
wangzhenxing 6606b6bc64 56级宝物显示在背包 2022-04-28 13:46:14 +08:00
yuanshuai bce1445a77 神印商店红点添加 2022-04-26 19:08:26 +08:00
yuanshuai 4e5ccff820 身外化身界面调整 2022-04-25 14:42:17 +08:00
wangzhenxing e0263ea164 添加神印笔跳转 2022-04-25 13:43:46 +08:00
yuanshuai 50683260c7 挑战副本红点提交 2022-04-20 13:23:08 +08:00
jiaoyangna 7a1ccac3cd 【ID1011398】
山河设计图每日玉衡龙魂丹领取调整
2022-04-02 14:45:12 +08:00
wangzhenxing a13dd2939a [功能]================神系英雄添加提叫 2022-03-28 18:18:19 +08:00
jiaoyangna 18803bfc29 东海寻仙提交 2022-03-18 13:25:09 +08:00
gaoxin e97ab8fa84 【跳转】锻器阁页签顺序修改导致判断错误 2022-03-11 17:34:15 +08:00
张彪 51196cf150 【灵兽宝阁】新增几档灵兽特惠礼包界面提交 2022-02-18 15:14:25 +08:00
张彪 a6d0a4f7f0 【战力冲刺】提交 2022-02-17 17:14:33 +08:00
张彪 14af727eab 【战力冲刺】提交 2022-02-17 16:27:36 +08:00
gaoxin 63343f88c7 【拍脸】寻仙招募拍脸跳转添加引导小手 2022-02-24 15:56:53 +08:00
gaoxin 2b413264fd 【头像】加入英雄是否进入版本判断-删除log 2022-02-11 16:06:38 +08:00
gaoxin a2ee17f6c3 【头像】加入英雄是否进入版本判断 2022-02-11 16:05:51 +08:00
jiaoyangna 98a095ee46 【活动优化】超值返利 2022-02-11 15:09:32 +08:00
张彪 92d47074a4 【超值基金】提交 2022-01-24 17:31:40 +08:00
张彪 d1bb3391ac 【超值基金】提交 2022-01-24 17:09:55 +08:00
jiaoyangna 90c21e5a73 协议提交 2022-01-20 16:17:26 +08:00
jiaoyangna 1c24a85612 添加红点 2022-01-20 11:22:39 +08:00
jiaoyangna a544abe9cc 众志成城 2022-01-19 17:47:07 +08:00
jiaoyangna ac24c2e0ce 【ID1010998】
【春节活动】签到领奖活动
2022-01-18 14:48:27 +08:00
ZhangBiao 4e00c5e9c3 【名望礼包】红点 2022-01-17 14:10:08 +08:00
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
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
ZhangBiao 8da0a81588 【寻仙抽】提交 2021-11-25 15:59:31 +08:00
ZhangBiao ac768ff163 【常驻活动】提交 2021-11-24 18:14:25 +08:00
ZhangBiao aa52131d3f 【灵脉秘境】文字遮挡、跳转 2021-11-22 13:27:54 +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
ZhangBiao ea4661b254 【无尽副本】修改 2021-11-05 15:50:49 +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
gaoxin 7a5f41ef46 【积天豪礼】分离到主城 2021-11-10 00:58:39 +08:00
wangzhenxing ae47df29bb 【红点】=============修行技能红点提交 2021-10-22 10:08:53 +08:00
ZhangBiao a6ebd138e4 【新百宝商会】提交 2021-10-21 17:28:53 +08:00