jiaoyangna
|
1152586ff1
|
好感度提交
|
2021-09-26 09:54:58 +08:00 |
ZhangBiao
|
5c11a67393
|
【七界试炼】修改提交
|
2021-09-23 12:01:58 +08:00 |
ZhangBiao
|
5f80bbb7a1
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-09-22 16:26:04 +08:00 |
ZhangBiao
|
0b9055110d
|
【七界试炼】红点
|
2021-09-22 16:25:29 +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 |
yuanshuai
|
db18313495
|
Merge branch '0功能/四象心法' into china/dev
# Conflicts:
# Assets/ManagedResources/EffectResUI/XunBaoMiZong.meta
# Assets/ManagedResources/Icon/Item/r_yjsp.png.meta
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# 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/ActivityProto.proto
# Assets/ManagedResources/~Lua/Message/ArenaInfoProto.proto
# Assets/ManagedResources/~Lua/Message/ChatProto.proto
# Assets/ManagedResources/~Lua/Message/CommonProto.proto
# Assets/ManagedResources/~Lua/Message/Family.proto
# Assets/ManagedResources/~Lua/Message/FightInfoProto.proto
# Assets/ManagedResources/~Lua/Message/HeroInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MapInfoProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto.proto
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto.proto
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-09-22 15:12:32 +08:00 |
gaoxin
|
5f11f26c4d
|
【红点】报错优化
|
2021-09-17 15:09:10 +08:00 |
gaoxin
|
7462f02cfd
|
Revert Revert 回滚错误的合并 4f19f12612
|
2021-09-15 14:29:14 +08:00 |
yuanshuai
|
4c66f50e66
|
Merge branch 'china/dev' into 0功能/四象心法
# Conflicts:
# 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/Practice/PracticePanel.lua
|
2021-09-10 09:38:55 +08:00 |
yuanshuai
|
247ad9fdc7
|
【四象心法提交】
|
2021-09-09 20:45:12 +08:00 |
jiaoyangna
|
4f266a20b9
|
红点问题修改提交
|
2021-09-01 14:17:21 +08:00 |
jiaoyangna
|
1744845cba
|
建木神树转移到修行
|
2021-09-01 11:57:15 +08:00 |
jiaoyangna
|
72931e8ad6
|
失败返回报错修改
|
2021-08-31 13:59:03 +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 |
gaoxin
|
c325bf563f
|
Revert 回滚错误的合并 4f19f12612
|
2021-08-26 16:43:27 +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
|
bd7383f063
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-08-23 16:47:26 +08:00 |
jiaoyangna
|
ca656636ac
|
太初秘卷红点提交
(cherry picked from commit cbdcb66b07470bbc0662f04627503a175c097c8f)
|
2021-08-23 14:09:43 +08:00 |
ZhangBiao
|
2612c2e01e
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-08-17 19:53:05 +08:00 |
jiaoyangna
|
faf7591cf5
|
玲珑宝镜修改
|
2021-08-17 17:14:03 +08:00 |
ZhangBiao
|
edc728227c
|
【寻宝密宗】提交
|
2021-08-10 14:57:45 +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 |
ZhangBiao
|
ffd0685d97
|
【任务跳转】未解锁灵兽山,灵兽招募任务前往提示活动未开启,应提示功能未解锁
【红点】车迟斗法的红点仍绑在副本入口处,而非公会按钮
|
2021-07-28 11:20:27 +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 |
DESKTOP-98AVA47\Administrator
|
022681face
|
红点修改提交
|
2021-07-23 11:36:44 +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 |
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 |
jiaoyangna
|
a8fd256812
|
ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
(cherry picked from commit 53e0f1adcc )
|
2021-07-14 16:59:59 +08:00 |
jiaoyangna
|
53e0f1adcc
|
ID1009412】
【超值基金】超值基金页面及奖励领取逻辑优化
|
2021-07-14 12:04:37 +08:00 |
ZhangBiao
|
c8b8a84d47
|
【山河试炼】差红点检测
|
2021-07-14 11:36:33 +08:00 |
jiaoyangna
|
1ead3c126d
|
抽卡红点提交
|
2021-07-10 14:56:28 +08:00 |
zhangqiang
|
1be2dc60eb
|
【缥缈之旅】提交1
|
2021-07-01 20:13:47 +08:00 |
jiaoyangna
|
e562176180
|
超凡入圣提交
|
2021-06-18 18:24:04 +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 |
gaoxin
|
fe517d91ed
|
【红点】还原清空所有红点的操作
|
2021-06-04 23:56:09 +08:00 |
ZhangBiao
|
39180183a9
|
【任务头像】红点问题修改
|
2021-06-04 18:41:32 +08:00 |
gaoxin
|
4077e33390
|
【红点】箭头红点不消失修复
|
2021-06-03 19:30:57 +08:00 |
ZhangBiao
|
07a877bd4c
|
【牛气冲天】红点修改
|
2021-06-03 18:19:12 +08:00 |
ZhangBiao
|
d19325ce7b
|
【公会红点】报错修改
|
2021-06-03 17:59:14 +08:00 |
wangzhenxing
|
2cde942f47
|
[限时祈愿]=====红点逻辑修改
|
2021-06-03 12:04:04 +08:00 |
DESKTOP-98AVA47\Administrator
|
1f75672cb8
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 18:15:45 +08:00 |
zhangqiang
|
f265cb07ef
|
【山河社稷图】红点帮错 公会技能属性名称修改
|
2021-06-02 17:39:11 +08:00 |
zhangqiang
|
fb8410eaa5
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-06-01 19:48:05 +08:00 |
zhangqiang
|
859bd6679e
|
点将台10连加入红点提示
|
2021-06-01 19:47:54 +08:00 |
jiaoyangna
|
a1ac495ca2
|
红点提交
|
2021-06-01 17:22:23 +08:00 |
jiaoyangna
|
259155fe52
|
【ID1016093】
【无尽副本】点亮新图鉴时,副本没红点
|
2021-06-01 16:53:08 +08:00 |
wangzhenxing
|
10f97f9b8b
|
[许愿神将]===活动修改
|
2021-05-31 11:31:15 +08:00 |
jiaoyangna
|
4b33fee287
|
红点修改提交
|
2021-05-28 10:20:13 +08:00 |
jiaoyangna
|
89c667d314
|
无尽红点修改提交
|
2021-05-28 09:55:48 +08:00 |
ZhangBiao
|
b0226b664f
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-27 19:55:10 +08:00 |
ZhangBiao
|
13b222d998
|
【每日豪礼】可领取,没红点
|
2021-05-27 19:54:54 +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 |
DESKTOP-98AVA47\Administrator
|
0ad3913381
|
红点修改提交
|
2021-05-26 18:15:37 +08:00 |
wangzhenxing
|
b7eaf9a65a
|
Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
|
2021-05-26 16:03:40 +08:00 |
wangzhenxing
|
d821836909
|
福利红包修改提交
|
2021-05-26 16:03:28 +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
|
9e6dc29cb9
|
【主界面】右上伸缩条红点
|
2021-05-25 21:08:48 +08:00 |
ZhangBiao
|
cecea9b415
|
【修行】主界面 修行提交 1
|
2021-05-25 10:16:07 +08:00 |
jiaoyangna
|
33834cc9b2
|
Merge branch 'china/dev-c' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Atlas/FourElement.meta
# Assets/ManagedResources/Atlas/FourElement/ArtFont/s_silingshilian_yitongguan_zh.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_daodi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_di.jpg.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_fodi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_rendi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_renjieshiliandi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shilianjianglidi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_shoudi.png.meta
# Assets/ManagedResources/Atlas/FourElement/s_silingshilian_yaodi.png.meta
# Assets/ManagedResources/LuaBytes.meta
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.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/RoleInfo/RoleListPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.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/Battle/View/BattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua.meta
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua.meta
# 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/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralRewardPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
# Assets/ManagedResources/~Lua/View/ScrollCycleView.lua
|
2021-05-24 16:39:34 +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 |
ZhangBiao
|
70729ca2d0
|
【修行】增加红点
|
2021-05-24 11:21:56 +08:00 |
jiaoyangna
|
30a6a41fe6
|
无尽副本修改提交
|
2021-05-21 16:39:08 +08:00 |
wangzhenxing
|
db3b58ea8e
|
合并冲突提交
|
2021-05-21 15:05:09 +08:00 |
wangzhenxing
|
6ab70e6e8d
|
【功能】==========公会红包
|
2021-05-21 14:47:04 +08:00 |
gaoxin
|
989361e574
|
Merge branch 'china/ios' into china/dev-c
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
|
2021-05-19 15:15:13 +08:00 |
gaoxin
|
1b873eb38d
|
Merge branch 'china/dev-c' into china/ios
# Conflicts:
# Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
# Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
# Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
# Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
# Assets/ManagedResources/ArtFont_en/sl_en.png.meta
# Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
# Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
# Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
# Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
# Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
# Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
# Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
# Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
# Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
# Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
# Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
# Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
# Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
# Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
# Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
# Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
# Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
# Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
# Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
# Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
# Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
|
2021-05-19 14:12:37 +08:00 |
zhangqiang
|
491b7b54a7
|
【化虚坛优化】化虚坛中有可合成的将时,在神将头像、页签按钮,和化虚坛入口上添加红点提示
|
2021-05-19 10:27:55 +08:00 |
zhangqiang
|
e4eda3017e
|
【山河社稷图】提交
|
2021-05-13 20:30:10 +08:00 |
gaoxin
|
d413915c6a
|
【竞技场】修复竞技场赛季切换时也会显示红点儿的问题
|
2021-04-29 17:12:12 +08:00 |
gaoxin
|
2a107e99cb
|
【红点】关闭一些重复注册的红点
|
2021-04-27 16:30:08 +08:00 |
ZhangBiao
|
8117c5ebba
|
【云游商人】怎加红点
|
2021-04-22 10:59:32 +08:00 |
gaoxin
|
3819869e27
|
Merge branch 'china/dev' into china/ios
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleSkinPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleSkinPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
|
2021-04-21 17:54:16 +08:00 |
zhangqiang
|
bf895d04d1
|
【百宝斋】杂货商店和魂印商店免费次数到达上限的红点加回来
|
2021-04-21 17:49:58 +08:00 |
wangzhenxing
|
8e24eea290
|
称号bug修改
|
2021-04-21 14:42:06 +08:00 |
JLIOSM1
|
c31a82ef7f
|
【ios】lua文件格式修改
|
2021-04-20 13:58:00 +08:00 |
ZhangBiao
|
de85b844e5
|
【逐圣商店】取消主胜商店红点
|
2021-04-14 17:41:44 +08:00 |
gaoxin
|
839a9e4d1d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-04-12 17:03:11 +08:00 |
wangzhenxing
|
443ba942cf
|
[功能]================称号功能提交
|
2021-04-12 16:23:57 +08:00 |
gaoxin
|
196dfa34dd
|
【GM】添加红点数据查看工具
|
2021-04-09 16:14:24 +08:00 |
jiaoyangna
|
8291a48e73
|
Merge branch 'china_dev_merge' into xma_dev_b_merge
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity7/ArtFont.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas.meta
# Assets/ManagedResources/Atlas/FifteenDayGiftAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/NiuQiChongTianAtlas/ArtFont.meta
# Assets/ManagedResources/Atlas/SupremeHeroAtlas/ArtFont.meta
# Assets/ManagedResources/Icon/ChengHao.meta
# Assets/ManagedResources/Icon/ZuoQi.meta
# Assets/ManagedResources/Prefabs/UI/View/FetterItem.prefab
# Assets/ManagedResources/~Lua/Logic/Network.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua
# Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua
# Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
# Assets/ManagedResources/~Lua/Modules/FuXingGaoZhao/FuXingGaoZhaoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosPanel.lua
# Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
# Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua
# Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
# Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua
# Assets/ManagedResources/~Lua/View/FetterItem.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-04-09 12:24:01 +08:00 |
ZhangBiao
|
bfaa5195b5
|
Revert "【表删除】报错处理"
This reverts commit b163fc3035 .
|
2021-04-07 11:54:39 +08:00 |
ZhangBiao
|
58d20c0bd3
|
【限时活动】没东西有红点
|
2021-04-07 11:05:26 +08:00 |
ZhangBiao
|
63bcee6168
|
Merge branch '0活动开发聚集地/十五日登录' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-04-06 15:51:24 +08:00 |
gaoxin
|
b163fc3035
|
【表删除】报错处理
|
2021-04-06 15:16:37 +08:00 |
ZhangBiao
|
d69d96a321
|
【十五日登陆】红点
|
2021-04-02 11:53:07 +08:00 |
jiaoyangna
|
a6428eaaed
|
红点 修改提交
|
2021-04-01 13:44:05 +08:00 |
gaoxin
|
01aacccfaf
|
【红点】修复方法名错误
|
2021-03-31 22:31:36 +08:00 |
jiaoyangna
|
784ace13b5
|
红点提交
|
2021-03-31 22:22:53 +08:00 |
jiaoyangna
|
7d055c4e3a
|
红点提交
|
2021-03-31 21:46:14 +08:00 |
ZhangBiao
|
8796bf4957
|
【福星高照】提交
|
2021-03-30 10:27:18 +08:00 |
ZhangBiao
|
e8219c11b0
|
【牛气冲天】提交
|
2021-03-24 20:19:40 +08:00 |
ZhangBiao
|
f6af5a6a72
|
【建木神树】红点
|
2021-03-10 15:54:42 +08:00 |
jiaoyangna
|
cf3c571182
|
Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
# 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/RoleInfo/RoleEquipChangePopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
|
2021-03-08 11:14:15 +08:00 |
jiaoyangna
|
02ca65089f
|
Merge branch 'master_xma_local' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Harmony.meta
# Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
|
2021-03-08 10:27:14 +08:00 |
jiaoyangna
|
955bd044f1
|
四灵提交
|
2021-03-01 18:35:35 +08:00 |
jiaoyangna
|
629971d137
|
文本还原提交
|
2021-02-20 16:55:28 +08:00 |