Commit Graph

508 Commits (b05227f79e88b77c1c1db91d2f690c8deccee8a3)

Author SHA1 Message Date
jiaoyangna 61a2da78cd 超值基金跳转 2021-07-19 11:48:41 +08:00
jiaoyangna 4f0f69b17e 玲珑报警 2021-07-16 17:41:56 +08:00
DESKTOP-98AVA47\Administrator 18cc7ec6a4 红点报错修改提交 2021-07-15 19:20:20 +08:00
DESKTOP-98AVA47\Administrator 695a61abaa Merge branch '0优化/主题活动' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
2021-07-15 18:52:59 +08:00
DESKTOP-98AVA47\Administrator 4bd4f1f483 Merge branch '0功能/玲珑宝镜' into china/dev
# Conflicts:
#	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/Expert/PatFaceManager.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/Scripts/Editor/ExcelTool/DataConfigMD5Record.asset
2021-07-15 16:24:35 +08:00
DESKTOP-98AVA47\Administrator 36f04065fc Merge branch 'china/dev' into 0优化/主题活动
# Conflicts:
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png
#	Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta
#	Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-07-15 12:59:20 +08:00
ZhangBiao bc55cf3a19 Merge branch 'china/dev' into 0功能/山河试炼
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
2021-07-14 18:08:46 +08:00
wangzhenxing ca95dcb71e Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2021-07-14 18:05:56 +08:00
wangzhenxing 070fabb0a6 [乾坤宝盒]=========添加常量 2021-07-14 18:05:37 +08:00
jiaoyangna a8fd256812 ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化

(cherry picked from commit 53e0f1adcc)
2021-07-14 16:59:59 +08:00
jiaoyangna 047c5c26f7 globaldefine冲突修改 2021-07-14 16:59:03 +08:00
jiaoyangna 53e0f1adcc ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
2021-07-14 12:04:37 +08:00
ZhangBiao c8b8a84d47 【山河试炼】差红点检测 2021-07-14 11:36:33 +08:00
ZhangBiao 227def7404 【山河试炼】代码提交 2021-07-14 11:33:33 +08:00
jiaoyangna 9f4d456004 【ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
2021-07-13 17:25:21 +08:00
zhangqiang 5162b3247c 【跨服天梯】国内提交+1 2021-07-13 11:28:36 +08:00
jiaoyangna f710e20c60 抽卡红点提交 2021-07-10 18:12:50 +08:00
jiaoyangna 1ead3c126d 抽卡红点提交 2021-07-10 14:56:28 +08:00
jiaoyangna 30ab410f00 抽卡优化 2021-07-08 18:40:43 +08:00
jiaoyangna 13905916d1 【ID1009622】
【优化】主题活动中的珍奇宝阁、限时商市页面转移
2021-07-06 16:48:59 +08:00
zhangqiang de844aea18 【缥缈之旅】提交5 2021-07-03 19:23:15 +08:00
zhangqiang fbda34d678 Merge branch 'china/dev' into china/dev_缥缈之旅
# Conflicts:
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
2021-07-03 16:53:42 +08:00
zhangqiang 2f269ebfa8 【缥缈之旅】提交2 2021-07-03 12:37:56 +08:00
zhangqiang 1be2dc60eb 【缥缈之旅】提交1 2021-07-01 20:13:47 +08:00
ZhangBiao 3b674faa07 Merge branch 'china/dev' into 0活动开发聚集地/特惠神装 2021-07-01 15:44:19 +08:00
zhangqiang deb6eeca03 【跳转】增加惊喜礼盒跳转 2021-07-01 15:01:57 +08:00
ZhangBiao 47f6335b55 Merge branch 'china/dev' into 0活动开发聚集地/特惠神装 2021-07-01 14:44:48 +08:00
jiaoyangna bb9b58d489 Merge branch '0功能/神将来源' into china/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
2021-06-30 19:57:49 +08:00
jiaoyangna 349404d50e 【ID1009604】
【优化】限时心愿招募抽取的普通神将调整为同系卡
2021-06-30 19:28:43 +08:00
ZhangBiao 555ccd253f 【特惠神装】提交 2021-06-30 18:38:20 +08:00
ZhangBiao 00ad684deb 【心愿抽卡】QA 2021-06-30 13:51:47 +08:00
ZhangBiao 04d4f6a5c3 【特惠神装】开坑 2021-06-30 13:26:34 +08:00
jiaoyangna 37b7071ccf 【ID1009590】
【神将信息】增加神将获取途径来源预览功能
2021-06-29 20:05:15 +08:00
ZhangBiao 69581dcaa1 【心愿抽卡】开坑 2021-06-29 11:30:26 +08:00
jiaoyangna 10e4552c4f Merge branch 'china/dev-c' into 0功能/玲珑宝镜
# Conflicts:
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	Assets/ManagedResources/~Lua/Data/UIData.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
2021-06-28 10:31:22 +08:00
jiaoyangna de4bcd80b5 ID1009568】
【优化】首充活动页签优化,下方页签实现可拖动

(cherry picked from commit e44535915215170f3005403652faee3a7c3afc41)
2021-06-26 15:15:19 +08:00
zhangqiang 71540fcfd2 【跨服天梯】国内提交1 2021-06-25 15:23:55 +08:00
jiaoyangna 234f3cb48f ID1009568】
【优化】首充活动页签优化,下方页签实现可拖动

(cherry picked from commit e44535915215170f3005403652faee3a7c3afc41)
2021-06-23 18:51:35 +08:00
jiaoyangna 15361c2ef5 大圣跳转 2021-06-19 17:07:17 +08:00
jiaoyangna e562176180 超凡入圣提交 2021-06-18 18:24:04 +08:00
jiaoyangna 09095e5b16 Merge branch 'china/dev-c' into 0功能/升星预览
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
2021-06-18 11:08:40 +08:00
jiaoyangna 5c09522231 Merge branch '0活动开发聚集地/惊喜礼盒' into china/dev-inner 2021-06-17 17:19:27 +08:00
jiaoyangna 4f115efb05 活动提交 2021-06-17 17:18:42 +08:00
ZhangBiao 54bc0f2caa 【惊喜礼盒】提价 2021-06-17 15:26:10 +08:00
jiaoyangna 6f5cd1d44a 惊喜礼包推送 2021-06-17 15:21:22 +08:00
jiaoyangna b1e3d0a163 Merge branch '0功能/升星预览' into china/dev-c 2021-06-17 15:05:03 +08:00
ZhangBiao 0b4c5f3c8f 【惊喜礼盒】提交 2021-06-16 19:56:10 +08:00
jiaoyangna b96df9fc63 玲珑修改提交 2021-06-16 17:55:19 +08:00
jiaoyangna b83e8902d7 【ID1009368】
添加升星预览功能
2021-06-16 11:16:41 +08:00
gaoxin 0e2ec48bdc Revert "【山河试炼】代码提交"
This reverts commit 8cd3afb034.
2021-06-16 10:08:52 +08:00
gaoxin a4fa7cacff Revert "【山河试炼】差红点的检测"
This reverts commit 160a3e1a6f.
2021-06-16 10:08:41 +08:00
ZhangBiao 160a3e1a6f 【山河试炼】差红点的检测 2021-06-15 20:33:22 +08:00
zhangqiang 4438ad6a72 【跨服天梯】国内首提 2021-06-15 20:08:14 +08:00
ZhangBiao 8cd3afb034 【山河试炼】代码提交 2021-06-15 15:46:01 +08:00
jiaoyangna 733b11e1bd Revert "Revert "玲珑宝镜提交""
This reverts commit f0b9e1d8e6.
2021-06-09 17:11:13 +08:00
jiaoyangna f0b9e1d8e6 Revert "玲珑宝镜提交"
This reverts commit 8c0a90ef78.
2021-06-09 17:09:14 +08:00
jiaoyangna 8c0a90ef78 玲珑宝镜提交 2021-06-09 17:07:48 +08:00
jiaoyangna bf5c4197ce 【ID1009418】
【无尽副本】购买行动力任务,点击前往按钮关闭弹窗并打开购买行动力界面
2021-06-09 11:03:18 +08:00
jiaoyangna d91a94d309 【ID1009380】
【公会】公会信息弹窗上添加【?】按钮
2021-06-08 20:47:03 +08:00
gaoxin 746e92f23d 【战斗】日常副本,无尽副本,山河社稷图战斗背景修改 2021-06-04 15:01:48 +08:00
gaoxin 4077e33390 【红点】箭头红点不消失修复 2021-06-03 19:30:57 +08:00
wangzhenxing 9c3f1cb5eb [称号]====挂机界面特效显示修改,称号位置修改 2021-06-03 15:52:12 +08:00
wangzhenxing 2cde942f47 [限时祈愿]=====红点逻辑修改 2021-06-03 12:04:04 +08:00
wangzhenxing 6e2e88a930 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-06-02 18:26:56 +08:00
wangzhenxing 9bd4103768 【称号】====称号特效显示修改提交 2021-06-02 18:26:31 +08:00
jiaoyangna 259155fe52 【ID1016093】
【无尽副本】点亮新图鉴时,副本没红点
2021-06-01 16:53:08 +08:00
wangzhenxing 5ec2c38563 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-31 18:02:05 +08:00
wangzhenxing db6f172f70 [显示抽卡活动]============抽卡活动类型常量修改 2021-05-31 18:01:37 +08:00
ZhangBiao 9ebd4c5e05 【心愿抽卡】游戏里道具寻仙玉跳转不是限时商市,跳主题活动主页面 2021-05-31 18:00:42 +08:00
zhangqiang f7be239ea7 【踏碎凌霄】排行榜 2021-05-29 18:37:45 +08:00
zhangqiang 78ece97bfd Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:54:30 +08:00
zhangqiang 1dc1ad1db1 【幸运探宝】加标签 2021-05-28 15:54:20 +08:00
wangzhenxing 2526371970 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-28 15:09:29 +08:00
wangzhenxing 510b2460ea [限时祈愿] 活动奖励界面提交 2021-05-28 15:09:18 +08:00
zhangqiang 8dbf142b74 【踏碎凌霄】排行榜添加 2021-05-28 14:05:17 +08:00
wangzhenxing 2a21b80147 [限时祈愿]弹窗界面id修改 2021-05-28 11:05:50 +08:00
wangzhenxing 675ef2efd7 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
Conflicts:
	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
	Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
2021-05-28 10:47:07 +08:00
wangzhenxing 21574bebf1 【限时祈愿】==祈愿活动提交 2021-05-28 10:36:55 +08:00
jiaoyangna cde2379d78 常量重复修改 2021-05-27 22:43:50 +08:00
jiaoyangna 1e247043ac Merge branch '0优化/无尽副本' into china/dev-c
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-27 19:42:22 +08:00
jiaoyangna f49cefd6b3 战斗结算修改 2021-05-27 11:23:38 +08:00
jiaoyangna da6437e2a2 无尽提交 2021-05-27 10:46:22 +08:00
zhangqiang f758982d32 【山河社稷图】跳转 2021-05-27 09:50:11 +08:00
DESKTOP-98AVA47\Administrator 0ad3913381 红点修改提交 2021-05-26 18:15:37 +08:00
ZhangBiao f186f29646 提交 2021-05-26 14:44:22 +08:00
jiaoyangna c95211428b Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2021-05-26 11:55:14 +08:00
zhangqiang da9aeed441 【心魔试炼】提交 2021-05-26 11:48:44 +08:00
ZhangBiao f38620058c Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 21:09:43 +08:00
ZhangBiao 9e6dc29cb9 【主界面】右上伸缩条红点 2021-05-25 21:08:48 +08:00
zhangqiang fcc00ee1d7 【心魔试炼】提交 2021-05-25 20:50:23 +08:00
zhangqiang dfa198081a Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 14:51:58 +08:00
zhangqiang a1c4a6aa5c 【心魔】 + 山河社稷图修改 2021-05-25 14:51:26 +08:00
wangzhenxing 32b28f03eb Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 11:15:04 +08:00
wangzhenxing 1e82024f29 添加弹窗类型 2021-05-25 11:14:50 +08:00
ZhangBiao a22a984c61 Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c 2021-05-25 10:16:17 +08:00
ZhangBiao cecea9b415 【修行】主界面 修行提交 1 2021-05-25 10:16:07 +08:00
gaoxin 23001be1b4 【战斗】跳过优化 2021-05-24 19:20:22 +08:00
jiaoyangna c68da98b84 Merge branch 'china/dev-c' into 0优化/无尽副本 2021-05-24 14:43:42 +08:00
ZhangBiao fa051b65dc 【修行】QA增加 2021-05-24 13:58:30 +08:00
jiaoyangna c22e26a5f5 Merge branch 'china/dev-c' into 0优化/无尽副本
# Conflicts:
#	Assets/ManagedResources/Atlas/FuXingGaoZhao/f_fuxinggaozhao_1888.png.meta
#	Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
#	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/MessageTypeProto_pb.lua
#	Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
#	Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua
2021-05-24 13:53:28 +08:00