Commit Graph

222 Commits (e34f6a79cbd7410fec59ba16912d0403c43f4a90)

Author SHA1 Message Date
DESKTOP-98AVA47\Administrator 9b97a35ce8 mata 文件修改提交 2021-07-15 19:44:55 +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 55607708df 资源修改提交 2021-07-15 16:19:27 +08:00
gaoxin 9b48609229 【C#Log】C#层log打印走log等级控制 2021-07-09 11:56:53 +08:00
jiaoyangna b36edb9ae9 资源导入工具修改提交 2021-07-05 18:52:37 +08:00
jiaoyangna c6963b337c 添加音频导入工具 2021-07-05 16:43:19 +08:00
jiaoyangna bc4d6fb744 资源导入工具修改提交
(cherry picked from commit e587f6d35d7b4b592e1785c1aa9bc27c190a0e0e)
2021-07-05 16:32:40 +08:00
wangzhenxing fd3b2c0ed6 [战斗]=============减怒数字图片字修改提交,生成材质球文本文件修改提交 2021-07-03 18:52:28 +08:00
zhangqiang c87576944f 【刷资源提交】 2021-07-03 17:02:18 +08:00
wangzhenxing 6ad90cf3cf [战斗]==========伤害文字修改提交 2021-07-03 15:50:58 +08:00
jiaoyangna cf412831e2 buildconfig 脚本提交 2021-07-02 16:24:50 +08:00
jiaoyangna 69ea241c46 config 修改 2021-07-02 16:23:09 +08:00
jiaoyangna 5bd477fbab config 修改提交 2021-07-02 13:05:29 +08:00
gaoxin 38b1a22a2d 【bug】尝试修复打开游戏时花瓶的问题 2021-06-30 19:50:47 +08:00
gaoxin 318323e50d 【配置】新增硬核渠道配置 2021-06-28 14:12:13 +08:00
jiaoyangna 0c7c48beaf 删除多余脚本 2021-06-28 11:10:23 +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
gaoxin 8085adfe25 【工具】同步战斗校验服,添加未进版本的文件 2021-06-28 10:27:08 +08:00
gaoxin da16945d78 【工具】同步战斗校验服代码添加,提交需svn命令行工具
https://www.visualsvn.com/files/Apache-Subversion-1.14.1.zip
2021-06-26 19:52:08 +08:00
gaoxin d89d4427c1 【背景适配】优化宽屏下背景显示错误 2021-06-26 15:16:50 +08:00
gaoxin 09cddf573e 【背景适配】优化宽屏下背景显示错误 2021-06-25 11:12:22 +08:00
jiaoyangna 1690b59b67 buildconfig工具优化 2021-06-24 16:22:21 +08:00
gaoxin 9d0c42f0ca 【配置】添加硬核渠道,先遣打包配置,热更删除默认密码 2021-06-24 13:54:48 +08:00
jiaoyangna 8b3e5dbae4 config build 提交 2021-06-22 20:41:51 +08:00
jiaoyangna 97da91abc3 buildconfig 修改提交 2021-06-22 20:37:34 +08:00
gaoxin e88dcb7863 【热更】脚本优化,添加自动打tag的功能 2021-06-18 16:03:27 +08:00
gaoxin 12bd0b64a1 Merge branch 'china/zf_test' into china/dev-c
# Conflicts:
#	Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs
2021-06-17 10:26:13 +08:00
JieLing a9685687a3 Merge branch 'china/zf_test' of http://60.1.1.230/gaoxin/JL_Client into china/zf_test 2021-06-17 10:01:30 +08:00
gaoxin 6cf9492d06 【优化更新界面显示】 2021-06-16 18:23:30 +08:00
gaoxin 98b1518306 【添加stream配置】 2021-06-16 17:29:17 +08:00
gaoxin fbd02f1a29 【工具】热更和打包工具完成后自动提交 2021-06-16 11:47:07 +08:00
gaoxin 0814f45cfa 【热更】先遣服相关热更配置添加,腾讯云路径刷新功能添加 2021-06-16 11:47:00 +08:00
JieLing b7e78d9d5f Revert Revert "【包配置】将登录图配置放到streaming文件夹" 2021-06-16 10:44:12 +08:00
gaoxin eb27240907 【热更】修复草花cdn报错 2021-06-11 19:26:20 +08:00
gaoxin 2a945825d9 【热更】修复草花cdn报错 2021-06-11 19:24:04 +08:00
gaoxin 57ece39059 【热更】添加草花和灵动专服的配置 2021-06-11 18:28:32 +08:00
gaoxin c9d6c66259 【热更】添加草花和灵动专服的配置 2021-06-11 18:02:42 +08:00
gaoxin 3ba5186b7b 【热更】没有更新 files文件 2021-06-11 13:19:22 +08:00
gaoxin ee8577248e 【热更】没有更新 files文件 2021-06-11 13:16:55 +08:00
gaoxin 9ec33b5c6d 【热更】添加测试服和喜扑的配置 2021-06-11 13:04:29 +08:00
gaoxin 41af3c5db2 【热更新工具】 2021-06-11 13:04:22 +08:00
gaoxin 65e7971693 【热更】添加测试服和喜扑的配置 2021-06-11 13:02:12 +08:00
gaoxin 7cb79b4de3 【热更新工具】 2021-06-11 12:46:14 +08:00
gaoxin 06875b8986 【包配置】喜扑多渠道处理 2021-06-11 08:58:15 +08:00
gaoxin 28c7d285a0 Revert "【包配置】将登录图配置放到streaming文件夹"
This reverts commit 03d56901d7.
2021-06-11 02:36:08 +08:00
gaoxin 03d56901d7 【包配置】将登录图配置放到streaming文件夹 2021-06-11 01:48:39 +08:00
JieLing 530374e00b 【资源】循环引用资源优化 2021-06-10 22:53:11 +08:00
gaoxin a943681b63 【工具】热更工具添加同步GIT的功能 2021-06-10 10:32:10 +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